From b3d8d750de2c6c470f14468663de4781388be598 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 5 Aug 2015 13:21:21 +0200
Subject: [PATCH] Remove /etc/nixos/nixpkgs from $NIX_PATH

NixOS hasn't used /etc/nixos/nixpkgs for a long time, so it's time to
get rid of it.
---
 nixos/doc/manual/release-notes/rl-unstable.xml  | 9 +++++++++
 nixos/modules/services/misc/nix-daemon.nix      | 1 -
 pkgs/tools/package-management/nixui/default.nix | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index aedc85f3069..c50df94bfd8 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -188,6 +188,15 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.cabal-install
   </para>
 </listitem>
 
+<listitem>
+  <para>
+    The Nix expression search path (<envar>NIX_PATH</envar>) no longer
+    contains <filename>/etc/nixos/nixpkgs</filename> by default. You
+    can override <envar>NIX_PATH</envar> by setting
+    <option>nix.nixPath</option>.
+  </para>
+</listitem>
+
 </itemizedlist>
 </para>
 
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 7c42076280c..4aed91c3497 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -313,7 +313,6 @@ in
         type = types.listOf types.str;
         default =
           [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
-            "nixpkgs=/etc/nixos/nixpkgs"
             "nixos-config=/etc/nixos/configuration.nix"
             "/nix/var/nix/profiles/per-user/root/channels"
           ];
diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix
index 73004091a42..dd9dbed2995 100644
--- a/pkgs/tools/package-management/nixui/default.nix
+++ b/pkgs/tools/package-management/nixui/default.nix
@@ -2,7 +2,7 @@
 , profilePaths ? (config.nixui.profilePaths or ["/nix/var/nix/profiles"])
 , dataDir ? (config.nixui.dataDir or "/tmp")
 , configurations ? (config.nixui.configurations or ["/etc/nixos/configuration.nix"])
-, NIX_PATH ? (config.nixui.NIX_PATH or "/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos-config=/etc/nixos/configuration.nix") }:
+, NIX_PATH ? (config.nixui.NIX_PATH or "/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix") }:
 let
   version = "0.1.2";
   src = fetchgit {