From 65522d05d4bcd701af0d1f2cc882269dc379ce06 Mon Sep 17 00:00:00 2001 From: Daniel Peebles Date: Thu, 15 Jan 2015 22:47:47 -0500 Subject: [PATCH] Turn nixUnstable back on --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 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 91c35b59964a..251ff5b220cc 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.8pre3919_f43a8ed"; + name = "nix-1.9pre4020_f6716e9"; src = fetchurl { - url = http://hydra.nixos.org/build/17676230/download/4/nix-1.8pre3919_f43a8ed.tar.xz; - sha256 = "6837adca17a1571fb82f7db0f21230577ff5d3d9b2a5ae1e465862033c6fded4"; + url = "http://hydra.nixos.org/build/18780017/download/4/${name}.tar.xz"; + sha256 = "0jki14yxwv1f33fqkd1bi8bpxafkzjv8yixiwnw8nkhx074sipsn"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 895977fc4fa7..c6588aea9c0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12838,13 +12838,10 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; - /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; }; - */ - nixUnstable = nixStable; nixops = callPackage ../tools/package-management/nixops { };