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

treewide: Use correct output of config.nix.package in non-string contexts

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-24 14:06:04 +03:00 committed by Vladimír Čunát
parent 60f5659dad
commit 1d4b21ef42
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/installer/tools/auto-upgrade.nix
View File

@ -78,7 +78,7 @@ let cfg = config.system.autoUpgrade; in
HOME = "/root"; HOME = "/root";
}; };
path = [ pkgs.gnutar pkgs.xz.bin config.nix.package ]; path = [ pkgs.gnutar pkgs.xz.bin config.nix.package.out ];
script = '' script = ''
${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch ${toString cfg.flags} ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch ${toString cfg.flags}

2
nixos/modules/installer/tools/nixos-rebuild.sh
View File

@ -271,7 +271,7 @@ remotePATH=
if [ -n "$buildNix" ]; then if [ -n "$buildNix" ]; then
echo "building Nix..." >&2 echo "building Nix..." >&2
nixDrv= nixDrv=
if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then
if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then
if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then
nixStorePath="$(prebuiltNix "$(uname -m)")" nixStorePath="$(prebuiltNix "$(uname -m)")"

6
nixos/modules/installer/tools/tools.nix
View File

@ -22,17 +22,17 @@ let
src = ./nixos-install.sh; src = ./nixos-install.sh;
inherit (pkgs) perl pathsFromGraph; inherit (pkgs) perl pathsFromGraph;
nix = config.nix.package; nix = config.nix.package.out;
nixClosure = pkgs.runCommand "closure" nixClosure = pkgs.runCommand "closure"
{ exportReferencesGraph = ["refs" config.nix.package]; } { exportReferencesGraph = ["refs" config.nix.package.out]; }
"cp refs $out"; "cp refs $out";
}; };
nixos-rebuild = makeProg { nixos-rebuild = makeProg {
name = "nixos-rebuild"; name = "nixos-rebuild";
src = ./nixos-rebuild.sh; src = ./nixos-rebuild.sh;
nix = config.nix.package; nix = config.nix.package.out;
}; };
nixos-generate-config = makeProg { nixos-generate-config = makeProg {

2
nixos/modules/services/misc/nix-daemon.nix
View File

@ -6,7 +6,7 @@ let
cfg = config.nix; cfg = config.nix;
nix = cfg.package; nix = cfg.package.out;
makeNixBuildUser = nr: makeNixBuildUser = nr:
{ name = "nixbld${toString nr}"; { name = "nixbld${toString nr}";

2
nixos/modules/services/networking/nix-serve.nix
View File

@ -50,7 +50,7 @@ in
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ config.nix.package pkgs.bzip2.bin ]; path = [ config.nix.package.out pkgs.bzip2.bin ];
environment.NIX_REMOTE = "daemon"; environment.NIX_REMOTE = "daemon";
environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile; environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;

2
nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
View File

@ -14,7 +14,7 @@ let
inherit (pkgs) python gummiboot; inherit (pkgs) python gummiboot;
nix = config.nix.package; nix = config.nix.package.out;
timeout = if cfg.timeout != null then cfg.timeout else ""; timeout = if cfg.timeout != null then cfg.timeout else "";