public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partially revert "Revert "nixos: remove rsync from base install and add explicit path in nixos-install""

Browse Source 
This partially reverts commit 0aa7520670.

Fine for rsync to be in system path but we still need the explicit path
in nixos-install in case it is invoked from non-NixOS systems and also
to fix OVA test failure

See also https://github.com/NixOS/nixpkgs/commit/0aa75206705afc71b991cceeede644c87088d583

cc @edolstra
This commit is contained in:
obadz
2016-09-06 11:49:03 +01:00
parent e7afac83c9
commit 3f1ceae281
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/installer/tools/tools.nix
+1 -1
View File
@@ -21,7 +21,7 @@ let
name = "nixos-install";
src = ./nixos-install.sh;
inherit (pkgs) perl pathsFromGraph;
inherit (pkgs) perl pathsFromGraph rsync;
nix = config.nix.package.out;
cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
root_uid = config.ids.uids.root;