Author: eelco
Date: Wed Apr 27 15:42:14 2011
New Revision: 27006
URL: https://svn.nixos.org/websvn/nix/?rev=27006&sc=1
Log:
* nixos-checkout depends on subversion. (The original nixos-checkout
did a "nix-env -i subversion", which may be preferable to a static
dependency.)
Modified:
nixos/trunk/modules/installer/tools/nixos-checkout.nix
Modified: nixos/trunk/modules/installer/tools/nixos-checkout.nix
==============================================================================
--- nixos/trunk/modules/installer/tools/nixos-checkout.nix Wed Apr 27
15:34:33 2011 (r27005)
+++ nixos/trunk/modules/installer/tools/nixos-checkout.nix Wed Apr 27
15:42:14 2011 (r27006)
@@ -28,13 +28,18 @@
fi
# Check out the NixOS and Nixpkgs sources.
- svn co https://svn.nixos.org/repos/nix/nixos/trunk nixos
- svn co https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs
+ ${pkgs.subversion}/bin/svn co
https://svn.nixos.org/repos/nix/nixos/trunk nixos
+ ${pkgs.subversion}/bin/svn co
https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs
'';
};
in
{
- environment.systemPackages = [ nixosCheckout ];
+ environment.systemPackages =
+ [ nixosCheckout
+ # Since the checkout script depends on Subversion, we may as
+ # well put it in $PATH.
+ pkgs.subversion
+ ];
}
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
