Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a0e496acd0d7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0e4417f1185e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 19, 2020

  1. Revert "nixos: Introduce nix.buildLocation option" 

    This reverts commit 5291925.
Reason: This started to cause severe regressions, see:
- #85552
- #83166 (review)
Fixes #85552.
    @primeos
    primeos committed Apr 19, 2020
    Copy the full SHA
    0e4417f View commit details
Showing with 1 addition and 15 deletions.
  1. +1 −15 nixos/modules/services/misc/nix-daemon.nix
16 changes: 1 addition & 15 deletions nixos/modules/services/misc/nix-daemon.nix
View file
Original file line number Diff line number Diff line change
@@ -430,16 +430,6 @@ in
'';
};

buildLocation = mkOption {
type = types.str;
default = "/tmp";
example = "/var/buildroot";
description = ''
Temporary directory, which used to unpack and build source packages.
(by default <filename>/tmp</filename> is used, which commonly reside on tmpfs,
and big packages (like browsers) can just not fit there)
'';
};
};

};
@@ -486,9 +476,7 @@ in
++ optionals cfg.distributedBuilds [ pkgs.gzip ];

environment = cfg.envVars
// { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt";
TMPDIR = cfg.buildLocation;
}
// { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; }
// config.networking.proxy.envVars;

unitConfig.RequiresMountsFor = "/nix/store";
@@ -502,8 +490,6 @@ in
restartTriggers = [ nixConf ];
};

systemd.tmpfiles.rules = [ "d ${cfg.buildLocation} 0775 root root -" ];

# Set up the environment variables for running Nix.
environment.sessionVariables = cfg.envVars //
{ NIX_PATH = cfg.nixPath;