diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 16:28:04 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:57 +0100 |
commit | 259f7a93b1e679b73026352b40029375aa94db7c (patch) | |
tree | 353259f8f7622375aa0a584e31ad16c20f95a6a3 /nixos/modules/installer | |
parent | 44d6d887390bbf0fd99d2bf95d75e6292357fd50 (diff) | |
download | nixlib-259f7a93b1e679b73026352b40029375aa94db7c.tar nixlib-259f7a93b1e679b73026352b40029375aa94db7c.tar.gz nixlib-259f7a93b1e679b73026352b40029375aa94db7c.tar.bz2 nixlib-259f7a93b1e679b73026352b40029375aa94db7c.tar.lz nixlib-259f7a93b1e679b73026352b40029375aa94db7c.tar.xz nixlib-259f7a93b1e679b73026352b40029375aa94db7c.tar.zst nixlib-259f7a93b1e679b73026352b40029375aa94db7c.zip |
Rename environment.nix -> nix.package
Diffstat (limited to 'nixos/modules/installer')
-rw-r--r-- | nixos/modules/installer/cd-dvd/channel.nix | 2 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 4 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/system-tarball.nix | 4 | ||||
-rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 2 | ||||
-rw-r--r-- | nixos/modules/installer/tools/tools.nix | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index c6e0f1577bb1..bcf3dbb3f735 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -33,7 +33,7 @@ in if ! [ -e /var/lib/nixos/did-channel-init ]; then echo "unpacking the NixOS/Nixpkgs sources..." mkdir -p /nix/var/nix/profiles/per-user/root - ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \ + ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \ -i ${channelSources} --quiet --option use-substitutes false mkdir -m 0700 -p /root/.nix-defexpr ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index de9728d677c5..b803a3f188b9 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -298,12 +298,12 @@ in '' # After booting, register the contents of the Nix store on the # CD in the Nix database in the tmpfs. - ${config.environment.nix}/bin/nix-store --load-db < /nix/store/nix-path-registration + ${config.nix.package}/bin/nix-store --load-db < /nix/store/nix-path-registration # nixos-rebuild also requires a "system" profile and an # /etc/NIXOS tag. touch /etc/NIXOS - ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system + ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; # Add vfat support to the initrd to enable people to copy the diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix index 6bf8eebdac59..8d678fba71f5 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball.nix @@ -77,14 +77,14 @@ in # After booting, register the contents of the Nix store on the # CD in the Nix database in the tmpfs. if [ -f /nix-path-registration ]; then - ${config.environment.nix}/bin/nix-store --load-db < /nix-path-registration && + ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration && rm /nix-path-registration fi # nixos-rebuild also requires a "system" profile and an # /etc/NIXOS tag. touch /etc/NIXOS - ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system + ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; }; diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index d655210c90ee..0eca902dd741 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -109,7 +109,7 @@ fi # more conservative. if [ "$action" != dry-run -a -n "$buildNix" ]; then echo "building Nix..." >&2 - if ! nix-build '<nixpkgs/nixos>' -A config.environment.nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then + if ! nix-build '<nixpkgs/nixos>' -A config.nix.package -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then if ! nix-build '<nixpkgs/nixos>' -A nixFallback -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then nix-build '<nixpkgs>' -A nixUnstable -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null fi diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 074c77b51467..2c68ec5fe224 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -22,10 +22,10 @@ let src = ./nixos-install.sh; inherit (pkgs) perl pathsFromGraph; - nix = config.environment.nix; + nix = config.nix.package; nixClosure = pkgs.runCommand "closure" - { exportReferencesGraph = ["refs" config.environment.nix]; } + { exportReferencesGraph = ["refs" config.nix.package]; } "cp refs $out"; }; |