about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-01-31 22:22:47 +0100
committerEelco Dolstra <edolstra@gmail.com>2018-01-31 22:24:24 +0100
commitef351646bad830097a5dde943337432754119f11 (patch)
tree3bf30ae88cf4adb8c2054ae8e03998db9c92b711 /pkgs/tools
parentdf45c65aaea5bcf84474f8679c6ac52a0a5e9d0c (diff)
downloadnixlib-ef351646bad830097a5dde943337432754119f11.tar
nixlib-ef351646bad830097a5dde943337432754119f11.tar.gz
nixlib-ef351646bad830097a5dde943337432754119f11.tar.bz2
nixlib-ef351646bad830097a5dde943337432754119f11.tar.lz
nixlib-ef351646bad830097a5dde943337432754119f11.tar.xz
nixlib-ef351646bad830097a5dde943337432754119f11.tar.zst
nixlib-ef351646bad830097a5dde943337432754119f11.zip
Revert "Restore "nixUnstable: rename to nix-unstable""
This reverts commit 695027f61c702ea0de6baa3122b282d672fede09.

We really can't have "nix-env -i nix" *not* upgrade nixUnstable to a
newer nixStable. For instance, it would cause "nix upgrade-nix" to
produce a user environment with collisions.
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/package-management/nix/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index d67aebb52360..faee8f6cb968 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -160,7 +160,7 @@ in rec {
   }) // { perl-bindings = nixStable; };
 
   nixUnstable = (lib.lowPrio (common rec {
-    name = "nix-unstable-1.12${suffix}";
+    name = "nix-1.12${suffix}";
     suffix = "pre5873_b76e282d";
     src = fetchFromGitHub {
       owner = "NixOS";