From bcc0c1dc591542bedcf39db53f7f80733aacbc5c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 20 Jan 2013 17:25:09 +0100 Subject: [PATCH] Update nixUnstable --- pkgs/tools/package-management/nix/unstable.nix | 12 ++++++++---- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 30e52da8638..4c053c9e820 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.2pre2980_9de6bc5"; + name = "nix-1.4pre3044_536c85e"; src = fetchurl { - url = "http://hydra.nixos.org/build/3338447/download/4/${name}.tar.bz2"; - sha256 = "b767c2b75a0036edfc6be209dcaab23643887b192e3788640380ac27298b08d0"; + url = "http://hydra.nixos.org/build/3794557/download/5/${name}.tar.xz"; + sha256 = "d0f952ff3b4c0cf7f9682b45844ffb3686ff333d02be83341380186a97834f95"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = '' - --with-store-dir=${storeDir} --localstatedir=${stateDir} + --with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc --with-dbi=${perlPackages.DBI}/${perl.libPrefix} --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { CFLAGS=-O3 CXXFLAGS=-O3 ''; + makeFlags = "profiledir=$(out)/etc/profile.d"; + + installFlags = "sysconfdir=$(out)/etc"; + doInstallCheck = true; crossAttrs = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 173f080f652..a21103c84a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8978,14 +8978,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 { };