From b8a1e981809f6465220d0633633b074383f9e1e0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Apr 2011 15:42:14 +0000 Subject: [PATCH] * nixos-checkout depends on subversion. (The original nixos-checkout did a "nix-env -i subversion", which may be preferable to a static dependency.) svn path=/nixos/trunk/; revision=27006 --- modules/installer/tools/nixos-checkout.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix index 647e59a4a86..2d7304ea68d 100644 --- a/modules/installer/tools/nixos-checkout.nix +++ b/modules/installer/tools/nixos-checkout.nix @@ -28,13 +28,18 @@ let 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 + ]; }