public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove /etc/nixos/nixpkgs from $NIX_PATH

Browse Source 
NixOS hasn't used /etc/nixos/nixpkgs for a long time, so it's time to
get rid of it.
This commit is contained in:
Eelco Dolstra 2015-08-05 13:21:21 +02:00
parent 699ba71b50
commit b3d8d750de
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/doc/manual/release-notes/rl-unstable.xml
View File

@ -188,6 +188,15 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install
</para> </para>
</listitem> </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> </itemizedlist>
</para> </para>

1
nixos/modules/services/misc/nix-daemon.nix
View File

@ -313,7 +313,6 @@ in
type = types.listOf types.str; type = types.listOf types.str;
default = default =
[ "/nix/var/nix/profiles/per-user/root/channels/nixos" [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
"nixpkgs=/etc/nixos/nixpkgs"
"nixos-config=/etc/nixos/configuration.nix" "nixos-config=/etc/nixos/configuration.nix"
"/nix/var/nix/profiles/per-user/root/channels" "/nix/var/nix/profiles/per-user/root/channels"
]; ];

2
pkgs/tools/package-management/nixui/default.nix
View File

@ -2,7 +2,7 @@
, profilePaths ? (config.nixui.profilePaths or ["/nix/var/nix/profiles"]) , profilePaths ? (config.nixui.profilePaths or ["/nix/var/nix/profiles"])
, dataDir ? (config.nixui.dataDir or "/tmp") , dataDir ? (config.nixui.dataDir or "/tmp")
, configurations ? (config.nixui.configurations or ["/etc/nixos/configuration.nix"]) , 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 let
version = "0.1.2"; version = "0.1.2";
src = fetchgit { src = fetchgit {