Commit graph

4 commits

Author SHA1 Message Date
Yury G. Kudryashov 16dbde8987 Typo in xscreensaver corrected (introduced by merge)
svn path=/nixpkgs/branches/stdenv-updates/; revision=10292
2008-01-25 13:23:06 +00:00
Yury G. Kudryashov da57804fff Merged with trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
2008-01-23 18:11:03 +00:00
Yury G. Kudryashov 3896cd4a28 * Get rid of the `(import (__toPath ((toString
./JustNothing/.. )+"/"+args.version+".nix")))' hack, you can also just
  write `import (./path/to/pkg + "/${version}.nix)'.


svn path=/nixpkgs/branches/stdenv-updates/; revision=9886
2007-12-08 01:09:00 +00:00
Yury G. Kudryashov 356c077ecf Added XScreensaver; also changed version-stub.nix (now it does sumArgs itself, and requires builderDefs to be used) and added a merge of composing-builder and declarative flag processing.
svn path=/nixpkgs/branches/stdenv-updates/; revision=9880
2007-12-08 01:07:13 +00:00