summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-12-07 13:45:47 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-12-07 13:46:07 +0100
commit1c2439125147cdfb03108a5e2a925063dc64c486 (patch)
treed3531bba084b5a962e488f3b02cdacc42e10ad89 /pkgs/top-level/all-packages.nix
parent88ca46bfa0dc0fbb2a50e392dcc2e3e69f2ae874 (diff)
downloadnixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.tar
nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.tar.gz
nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.tar.bz2
nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.tar.lz
nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.tar.xz
nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.tar.zst
nixpkgs-1c2439125147cdfb03108a5e2a925063dc64c486.zip
nix: Update to 1.2
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fb79792ae6..07c8e3d5701 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8841,10 +8841,14 @@ let
     stateDir = config.nix.stateDir or "/nix/var";
   };
 
+  nixUnstable = nixStable;
+
+  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = config.nix.storeDir or "/nix/store";
     stateDir = config.nix.stateDir or "/nix/var";
   };
+  */
 
   nut = callPackage ../applications/misc/nut { };