Commit graph

4 commits

Author SHA1 Message Date
Nicolas Pierron 7aa27dfee2 Merge branches 'fix-style' and 'master' into fix-style
svn path=/nixos/branches/fix-style/; revision=13688
2009-01-02 19:41:39 +00:00
Eelco Dolstra a662f1c473 * Fix building the manual.
svn path=/nixos/trunk/; revision=12556
2008-08-08 19:25:31 +00:00
Eelco Dolstra ebb43a3f67 * Make the location of Nixpkgs a function argument (defaulting
to ../../nixpkgs).  This makes the "pkgs" symlink under the 
  nixos checkout unnecessary.

svn path=/nixos/trunk/; revision=11989
2008-06-05 15:33:17 +00:00
Eelco Dolstra e9a7f80681 * Build the Nix manual in a Nix expression instead of a Makefile so
that it becomes easier to include it on the CD.

svn path=/nixos/trunk/; revision=10070
2008-01-04 14:24:42 +00:00