diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-29 11:30:36 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-29 11:30:36 +0100 |
| commit | 60f1afe1995f56246ea132ea06f267b4f70f1c45 (patch) | |
| tree | d06b2781ebe5ca6792da2ff4542afaa656e8f9f8 | |
| parent | 3ad84542bfb8f6edc4dbab4a713dbf2fe7f5b9e8 (diff) | |
| download | nixlib-60f1afe1995f56246ea132ea06f267b4f70f1c45.tar nixlib-60f1afe1995f56246ea132ea06f267b4f70f1c45.tar.gz nixlib-60f1afe1995f56246ea132ea06f267b4f70f1c45.tar.bz2 nixlib-60f1afe1995f56246ea132ea06f267b4f70f1c45.tar.lz nixlib-60f1afe1995f56246ea132ea06f267b4f70f1c45.tar.xz nixlib-60f1afe1995f56246ea132ea06f267b4f70f1c45.tar.zst nixlib-60f1afe1995f56246ea132ea06f267b4f70f1c45.zip | |
nix: Update to 1.6.1
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 7b4bb3c61930..9b0b8b3f24e8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.6"; + name = "nix-1.6.1"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "2e451a6ad0b43997d8df71d29a7d20ef42f7715fe16efbf4b53bdcdd1d5227fe"; + sha256 = "31d15f99b2405924a4be278334cc973a71999303631e6798c1d294db9be4bf84"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f27e504bb3ba..dc46e5c8002a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9996,10 +9996,13 @@ 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"; }; + */ nixops = callPackage ../tools/package-management/nixops { }; |