From 93a963f347627cefb0830d028193d9416f18c94d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Mar 2013 22:35:33 +0100 Subject: [PATCH] nixUnstable: Update to the latest This is mostly to get rid of those annoying Perl warnings in NixOS... --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index ff36e0cc3cc..41ad7b4f4f2 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.4pre3056_79a3ba7"; + name = "nix-1.5.2pre3079_c3fc60d"; src = fetchurl { - url = "http://hydra.nixos.org/build/4070551/download/5/${name}.tar.xz"; - sha256 = "7478fd6fea91ec094645e8487b9ef001abd300703d79e04743f4d212469cf13d"; + url = "http://hydra.nixos.org/build/4445767/download/5/${name}.tar.xz"; + sha256 = "0422ceb1439cf1140e86f86514bdcb04b0706881ea31a9f6ee5206b9faad009b"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 618b423b160..0d3e4cca9a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8910,14 +8910,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"; }; - */ nut = callPackage ../applications/misc/nut { };