public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix: Update to 1.1

Browse Source
This commit is contained in:
Eelco Dolstra 2012-07-18 21:50:41 -04:00
parent 70298ba42c
commit d077a98e77
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/package-management/nix/default.nix
View File

@ -5,11 +5,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nix-1.0"; name = "nix-1.1";
src = fetchurl { src = fetchurl {
url = "http://hydra.nixos.org/build/2609700/download/4/${name}.tar.bz2"; url = "http://hydra.nixos.org/build/2860022/download/4/${name}.tar.bz2";
sha256 = "27f1d4d2a5fb1951bfc9e706c0894a961aed1afe0d095e16eb8fbef94ee7ec17"; sha256 = "edb2fc444eda49be144ca2901f1fc9472cd24896775ba02556ded5705863d324";
}; };
buildNativeInputs = [ perl pkgconfig ]; buildNativeInputs = [ perl pkgconfig ];
@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
'' + stdenv.lib.optionalString ( '' + stdenv.lib.optionalString (
stdenv.cross ? nix && stdenv.cross.nix ? system stdenv.cross ? nix && stdenv.cross.nix ? system
) ''--with-system=${stdenv.cross.nix.system}''; ) ''--with-system=${stdenv.cross.nix.system}'';
doInstallCheck = false; doInstallCheck = false;
}; };

4
pkgs/top-level/all-packages.nix
View File

@ -8529,10 +8529,14 @@ let
stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
}; };
nixUnstable = nix;
/*
nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; storeDir = getConfig [ "nix" "storeDir" ] "/nix/store";
stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
}; };
*/
nixCustomFun = src: preConfigure: enableScripts: configureFlags: nixCustomFun = src: preConfigure: enableScripts: configureFlags:
import ../tools/package-management/nix/custom.nix { import ../tools/package-management/nix/custom.nix {