diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-07 15:01:36 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-09 15:10:37 +0200 |
| commit | dc626693352250f21f0d2c6492757e6a916bcfc6 (patch) | |
| tree | 27e18e5b1970524e942ef958204206be341ffd6c /nixos/modules | |
| parent | 4d49006a0f8ebdf32416779167bcb783834f9629 (diff) | |
Set ‘allowSubstitutes = false’ on various derivations
This reduces the number of binary cache requests. See https://github.com/NixOS/nix/commit/b64988bb3585478676585a0f0aecbcf4e11d4432.
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/hardware/udev.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/system/dbus.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/system/activation/top-level.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd-lib.nix | 16 | ||||
| -rw-r--r-- | nixos/modules/system/etc/etc.nix | 1 |
5 files changed, 21 insertions, 3 deletions
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 50588e4495873..fc89de777e8e7 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -28,7 +28,10 @@ let # Perform substitutions in all udev rules files. udevRules = stdenv.mkDerivation { name = "udev-rules"; + preferLocalBuild = true; + allowSubstitutes = false; + buildCommand = '' mkdir -p $out shopt -s nullglob diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 853b458cf5899..5c20901427cb3 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -12,7 +12,10 @@ let configDir = pkgs.stdenv.mkDerivation { name = "dbus-conf"; + preferLocalBuild = true; + allowSubstitutes = false; + buildCommand = '' mkdir -p $out diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index b19fea57f6bfd..8393007981673 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -101,6 +101,7 @@ let if [] == failed then pkgs.stdenv.mkDerivation { name = "nixos-${config.system.nixosVersion}"; preferLocalBuild = true; + allowSubstitutes = false; buildCommand = systemBuilder; inherit (pkgs) utillinux coreutils; diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index 873fff15d3843..8acaa5212f5fd 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -13,13 +13,20 @@ rec { pathSafeName = lib.replaceChars ["@" ":" "\\"] ["-" "-" "-"] name; in if unit.enable then - pkgs.runCommand "unit-${pathSafeName}" { preferLocalBuild = true; inherit (unit) text; } + pkgs.runCommand "unit-${pathSafeName}" + { preferLocalBuild = true; + allowSubstitutes = false; + inherit (unit) text; + } '' mkdir -p $out echo -n "$text" > $out/${shellEscape name} '' else - pkgs.runCommand "unit-${pathSafeName}-disabled" { preferLocalBuild = true; } + pkgs.runCommand "unit-${pathSafeName}-disabled" + { preferLocalBuild = true; + allowSubstitutes = false; + } '' mkdir -p $out ln -s /dev/null $out/${shellEscape name} @@ -89,7 +96,10 @@ rec { as)); generateUnits = type: units: upstreamUnits: upstreamWants: - pkgs.runCommand "${type}-units" { preferLocalBuild = true; } '' + pkgs.runCommand "${type}-units" + { preferLocalBuild = true; + allowSubstitutes = false; + } '' mkdir -p $out # Copy the upstream systemd units we're interested in. diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index b57b03bcf962e..300ae0acda534 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -14,6 +14,7 @@ let builder = ./make-etc.sh; preferLocalBuild = true; + allowSubstitutes = false; /* !!! Use toXML. */ sources = map (x: x.source) etc'; |