diff options
| author | Shea Levy <shea@shealevy.com> | 2014-06-16 10:44:02 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-06-16 10:44:02 -0400 |
| commit | 52aa2afdcdee25398568381eb6da3ac2a40e8081 (patch) | |
| tree | ec98bf41dcb53e718091f7e6f87d648f46839071 /pkgs | |
| parent | 0f9b3ef24abc2bf77eba85a4e98d928cabaa4ee2 (diff) | |
| download | nixpkgs-52aa2afdcdee25398568381eb6da3ac2a40e8081.tar nixpkgs-52aa2afdcdee25398568381eb6da3ac2a40e8081.tar.gz nixpkgs-52aa2afdcdee25398568381eb6da3ac2a40e8081.tar.bz2 nixpkgs-52aa2afdcdee25398568381eb6da3ac2a40e8081.tar.lz nixpkgs-52aa2afdcdee25398568381eb6da3ac2a40e8081.tar.xz nixpkgs-52aa2afdcdee25398568381eb6da3ac2a40e8081.tar.zst nixpkgs-52aa2afdcdee25398568381eb6da3ac2a40e8081.zip | |
nixUnstable: bump
Diffstat (limited to 'pkgs')
| -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 c9cf7dc7916..f61b9eb818a 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.7pre3576_2b6c8ef"; + name = "nix-1.8pre3636_9d0709e"; src = fetchurl { - url = "http://hydra.nixos.org/build/10201398/download/5/${name}.tar.xz"; - sha256 = "7a735ac859a88a7042b1a7f33f3ab94e9374a0695c68cceb63d4536a79986236"; + url = "http://hydra.nixos.org/build/11854244/download/5/${name}.tar.xz"; + sha256 = "13h32d4nbkhvxhj9nyamxf6mfsi7mzvjz1bhyy63088vx468nhmm"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffe8e7185b6..b3ba6a64df2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10917,13 +10917,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 { }; |