diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-07 01:25:06 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-09 21:39:40 +0100 |
| commit | 582313bafef4c81cb6df2dcf2ece4757eb5c8082 (patch) | |
| tree | efd3e4326c4dd24d79ce2010292e51b006649e4a /nixos/modules | |
| parent | 57b7c3c545f35385dbe5a1eab44028f9233b736e (diff) | |
| download | nixlib-582313bafef4c81cb6df2dcf2ece4757eb5c8082.tar nixlib-582313bafef4c81cb6df2dcf2ece4757eb5c8082.tar.gz nixlib-582313bafef4c81cb6df2dcf2ece4757eb5c8082.tar.bz2 nixlib-582313bafef4c81cb6df2dcf2ece4757eb5c8082.tar.lz nixlib-582313bafef4c81cb6df2dcf2ece4757eb5c8082.tar.xz nixlib-582313bafef4c81cb6df2dcf2ece4757eb5c8082.tar.zst nixlib-582313bafef4c81cb6df2dcf2ece4757eb5c8082.zip | |
nixos: remove rsync from base install and add explicit path in nixos-install
As per https://github.com/NixOS/nixpkgs/commit/60b3f95ad86826faf95680a3529ced1c322d4d87#commitcomment-18507812
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/config/system-path.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 2 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/tools.nix | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 3054439da655..9708b5d9fe33 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -34,7 +34,6 @@ let config.programs.ssh.package pkgs.perl pkgs.procps - pkgs.rsync pkgs.strace pkgs.su pkgs.time diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index ae9f3a892950..0247925f4144 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -175,7 +175,7 @@ if ! NIX_DB_DIR=$mountPoint/nix/var/nix/db nix-store --check-validity @nix@ 2> / for i in $(@perl@/bin/perl @pathsFromGraph@ @nixClosure@); do echo " $i" chattr -R -i $mountPoint/$i 2> /dev/null || true # clear immutable bit - rsync -a $i $mountPoint/nix/store/ + @rsync@/bin/rsync -a $i $mountPoint/nix/store/ done # Register the paths in the Nix closure as valid. This is necessary diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index d8622b510522..a55c03bd9528 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -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"; |