summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorYegor Timoshenko <yegortimoshenko@riseup.net>2018-05-22 03:16:04 +0300
committerGitHub <noreply@github.com>2018-05-22 03:16:04 +0300
commit5da85431fb1df4fb3ac36730b2591ccc9bdf5c21 (patch)
treec1986a5880113aa51b109785c0497fbccfb4fdda /nixos
parent0106dfcbeb56742503a89309c60a95433514226e (diff)
parent0598652303a72739e6798a2eb4c06ac5bc31a46f (diff)
downloadnixpkgs-5da85431fb1df4fb3ac36730b2591ccc9bdf5c21.tar
nixpkgs-5da85431fb1df4fb3ac36730b2591ccc9bdf5c21.tar.gz
nixpkgs-5da85431fb1df4fb3ac36730b2591ccc9bdf5c21.tar.bz2
nixpkgs-5da85431fb1df4fb3ac36730b2591ccc9bdf5c21.tar.lz
nixpkgs-5da85431fb1df4fb3ac36730b2591ccc9bdf5c21.tar.xz
nixpkgs-5da85431fb1df4fb3ac36730b2591ccc9bdf5c21.tar.zst
nixpkgs-5da85431fb1df4fb3ac36730b2591ccc9bdf5c21.zip
Merge pull request #40892 from NixOS/no-more-nixpkgs-symlink
Stop requiring the nixpkgs symlink in NixOS channel tarballs
Diffstat (limited to 'nixos')
-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"
           ];