diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-25 16:45:27 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-25 16:46:19 +0200 |
commit | f9e5eccb13ffbbac3381cfa85ffd1748d3dacd77 (patch) | |
tree | 6e2cc9500ac56590d4c7b8fcdd3be22914579676 /nixos/modules/services | |
parent | 559a56320875a50950c4f789e199203aa1b7cd76 (diff) | |
parent | 1d4b21ef42a41fcecc254f61f279ad306f41e6b3 (diff) | |
download | nixlib-f9e5eccb13ffbbac3381cfa85ffd1748d3dacd77.tar nixlib-f9e5eccb13ffbbac3381cfa85ffd1748d3dacd77.tar.gz nixlib-f9e5eccb13ffbbac3381cfa85ffd1748d3dacd77.tar.bz2 nixlib-f9e5eccb13ffbbac3381cfa85ffd1748d3dacd77.tar.lz nixlib-f9e5eccb13ffbbac3381cfa85ffd1748d3dacd77.tar.xz nixlib-f9e5eccb13ffbbac3381cfa85ffd1748d3dacd77.tar.zst nixlib-f9e5eccb13ffbbac3381cfa85ffd1748d3dacd77.zip |
Merge #14953: fix fallout after splitting nix
I rebased this against master to avoid getting staging commits for now.
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 6 | ||||
-rw-r--r-- | nixos/modules/services/misc/nix-gc.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/misc/nix-ssh-serve.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/nix-serve.nix | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index c84c67ff2872..d71837737ab3 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -6,7 +6,7 @@ let cfg = config.nix; - nix = cfg.package; + nix = cfg.package.out; makeNixBuildUser = nr: { name = "nixbld${toString nr}"; @@ -65,8 +65,8 @@ in package = mkOption { type = types.package; - default = pkgs.nix.out; - defaultText = "pkgs.nix.out"; + default = pkgs.nix; + defaultText = "pkgs.nix"; description = '' This option specifies the Nix package instance to use throughout the system. ''; diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 6a7a7f4cee72..5c13da6e83dd 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -52,7 +52,7 @@ in systemd.services.nix-gc = { description = "Nix Garbage Collector"; - script = "exec ${config.nix.package}/bin/nix-collect-garbage ${cfg.options}"; + script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}"; startAt = optionalString cfg.automatic cfg.dates; }; diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index d70bd855c7ff..66148431709f 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -41,7 +41,7 @@ with lib; PermitTTY no PermitTunnel no X11Forwarding no - ForceCommand ${config.nix.package}/bin/nix-store --serve + ForceCommand ${config.nix.package.out}/bin/nix-store --serve Match All ''; diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 8f6881441cf7..3e865e3b76a8 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -50,7 +50,7 @@ in after = [ "network.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_SECRET_KEY_FILE = cfg.secretKeyFile; |