[Nix-commits] SVN commit: nix - r29813 - in disnix/disnixos/trunk: data doc/manual

[Sander van der Burg]

Author: sandervanderburg
Date: Thu Oct 13 11:03:00 2011
New Revision: 29813
URL: https://nixos.org/websvn/nix/?rev=29813&sc=1

Log:
Replaced occurences of NIXPKGS_ALL to NIX_PATH

Modified:
   disnix/disnixos/trunk/data/generate-infrastructure.nix.in
   disnix/disnixos/trunk/data/generate-services.nix.in
   disnix/disnixos/trunk/data/generate-tests.nix.in
   disnix/disnixos/trunk/data/testing.nix.in
   disnix/disnixos/trunk/doc/manual/installation.xml

Modified: disnix/disnixos/trunk/data/generate-infrastructure.nix.in
==============================================================================
--- disnix/disnixos/trunk/data/generate-infrastructure.nix.in   Thu Oct 13 
10:57:25 2011        (r29812)
+++ disnix/disnixos/trunk/data/generate-infrastructure.nix.in   Thu Oct 13 
11:03:00 2011        (r29813)
@@ -1,7 +1,7 @@
 { networkFile
 , useBackdoor ? false
-, nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
-, nixos ? builtins.getEnv "NIXOS"
+, nixpkgs ? <nixpkgs>
+, nixos ? <nixos>
 }:
 
 let

Modified: disnix/disnixos/trunk/data/generate-services.nix.in
==============================================================================
--- disnix/disnixos/trunk/data/generate-services.nix.in Thu Oct 13 10:57:25 
2011        (r29812)
+++ disnix/disnixos/trunk/data/generate-services.nix.in Thu Oct 13 11:03:00 
2011        (r29813)
@@ -1,6 +1,6 @@
 { networkFile
-, nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
-, nixos ? builtins.getEnv "NIXOS"
+, nixpkgs ? <nixpkgs>
+, nixos ? <nixos>
 }:
 
 let

Modified: disnix/disnixos/trunk/data/generate-tests.nix.in
==============================================================================
--- disnix/disnixos/trunk/data/generate-tests.nix.in    Thu Oct 13 10:57:25 
2011        (r29812)
+++ disnix/disnixos/trunk/data/generate-tests.nix.in    Thu Oct 13 11:03:00 
2011        (r29813)
@@ -1,6 +1,6 @@
 { networkFile
 , manifestFile
-, nixpkgs ? builtins.getEnv("NIXPKGS_ALL")
+, nixpkgs ? <nixpkgs>
 , disnix ? @DISNIX_PREFIX@
 , disnixos ? @prefix@
 }:

Modified: disnix/disnixos/trunk/data/testing.nix.in
==============================================================================
--- disnix/disnixos/trunk/data/testing.nix.in   Thu Oct 13 10:57:25 2011        
(r29812)
+++ disnix/disnixos/trunk/data/testing.nix.in   Thu Oct 13 11:03:00 2011        
(r29813)
@@ -1,5 +1,5 @@
-{ nixpkgs ? builtins.getEnv "NIXPKGS_ALL"
-, nixos ? builtins.getEnv "NIXOS"
+{ nixpkgs ? <nixpkgs>
+, nixos ? <nixos>
 , system ? builtins.currentSystem
 , disnix ? @DISNIX_PREFIX@
 , disnixos ? @prefix@

Modified: disnix/disnixos/trunk/doc/manual/installation.xml
==============================================================================
--- disnix/disnixos/trunk/doc/manual/installation.xml   Thu Oct 13 10:57:25 
2011        (r29812)
+++ disnix/disnixos/trunk/doc/manual/installation.xml   Thu Oct 13 11:03:00 
2011        (r29813)
@@ -94,7 +94,7 @@
                <para>
                        A copy of
                        <link 
xlink:href="http://nixos.org/nixpkgs";>Nixpkgs</link> is required
-                       and an environment variable <code>NIXPKGS_ALL</code> 
must point to the path where
+                       and an environment variable <code>NIX_PATH</code> must 
point to the path where
                        it is installed, so that Disnix is able to find it. In 
NixOS, a copy is 
                        already present and this environment variable has 
already been configured.
                        On other systems this variable can be configured by 
adding the following lines to your
@@ -106,8 +106,8 @@
 $ cat &gt;&gt; ~/.bash_profile &lt;&lt;EOF
 # Begin Nixpkgs addition
 
-NIXPKGS_ALL=/path/to/nixpkgs/pkgs/top-level/all-packages.nix
-export NIXPKGS_ALL
+NIX_PATH="nixpkgs=/path/to/nixpkgs"
+export NIX_PATH
 
 # End Nixpkgs addition
 EOF
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits