diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-17 16:06:58 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-17 16:06:58 +0200 |
| commit | ee330eaedf31a74577de875d63342a7ab6e0132f (patch) | |
| tree | e717ee111460182628a708af0b2ffd3299221912 | |
| parent | 8c047d4f2cf195152d3435d580ffe740f8f87917 (diff) | |
| download | nixlib-ee330eaedf31a74577de875d63342a7ab6e0132f.tar nixlib-ee330eaedf31a74577de875d63342a7ab6e0132f.tar.gz nixlib-ee330eaedf31a74577de875d63342a7ab6e0132f.tar.bz2 nixlib-ee330eaedf31a74577de875d63342a7ab6e0132f.tar.lz nixlib-ee330eaedf31a74577de875d63342a7ab6e0132f.tar.xz nixlib-ee330eaedf31a74577de875d63342a7ab6e0132f.tar.zst nixlib-ee330eaedf31a74577de875d63342a7ab6e0132f.zip | |
nixUnstable: Update to 1.7pre3252_792fd51
| -rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index ba0353e45078..a548a9f13bdd 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.6pre3220_fecad91"; + name = "nix-1.7pre3252_792fd51"; src = fetchurl { - url = "http://hydra.nixos.org/build/6038922/download/5/${name}.tar.xz"; - sha256 = "0251b8cb7ad2a4974a9c8002c65f1c6e1b334be082d3dd2f085929594637f947"; + url = "http://hydra.nixos.org/build/6500161/download/5/${name}.tar.xz"; + sha256 = "f99c1996292ea1a20068f0a6d58d3dc4775f30fdd22cdd756ac4d749acb2c20e"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ab59423da23..6e533c023035 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9920,13 +9920,10 @@ 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 { }; |