summary refs log tree commit diff
path: root/nixos/modules/services/misc/nix-daemon.nix
diff options
context:
space:
mode:
authorDaniel Peebles <copumpkin@users.noreply.github.com>2018-05-21 16:41:03 -0400
committerGitHub <noreply@github.com>2018-05-21 16:41:03 -0400
commit0598652303a72739e6798a2eb4c06ac5bc31a46f (patch)
tree222f6da36a320e86fa41d1646733c4ce0ec1ff31 /nixos/modules/services/misc/nix-daemon.nix
parent2a5b2550f38afc92dfe33acb0e9d3c20a139f941 (diff)
downloadnixpkgs-0598652303a72739e6798a2eb4c06ac5bc31a46f.tar
nixpkgs-0598652303a72739e6798a2eb4c06ac5bc31a46f.tar.gz
nixpkgs-0598652303a72739e6798a2eb4c06ac5bc31a46f.tar.bz2
nixpkgs-0598652303a72739e6798a2eb4c06ac5bc31a46f.tar.lz
nixpkgs-0598652303a72739e6798a2eb4c06ac5bc31a46f.tar.xz
nixpkgs-0598652303a72739e6798a2eb4c06ac5bc31a46f.tar.zst
nixpkgs-0598652303a72739e6798a2eb4c06ac5bc31a46f.zip
Stop requiring the nixpkgs symlink in NixOS channel tarballs
Ideally I'd like the whole `nixos`/`nixpkgs` channel distinction to disappear, but this is a step along that path. After a while being in this state, we can stop creating the magic `nixpkgs -> .` symlink inside our `nixos` channel tarballs and simplify that whole mess a bit.
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 277ae9e292c..8b940d71ebe 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -340,7 +340,7 @@ in
         default =
           [
             "$HOME/.nix-defexpr/channels"
-            "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs"
+            "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixos-config=/etc/nixos/configuration.nix"
             "/nix/var/nix/profiles/per-user/root/channels"
           ];