swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-25 06:30:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/NixOS/nixpkgs

Browse source
This commit is contained in:
Russell O'Connor 2012-08-19 01:05:17 -04:00
parent 706cbc9318 006e3fbf46
commit fdb659906a
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/package-management/nix/unstable.nix
View file

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "nix-1.1pre2749_ccc52ad";
name = "nix-1.1pre2789_7671018";
src = fetchurl {
url = "http://hydra.nixos.org/build/2841643/download/4/${name}.tar.bz2";
sha256 = "eae2135dd70d2734080ee644a597e131f60e71991dbabdabf67ab0818ff1f6fc";
url = "http://hydra.nixos.org/build/2949617/download/4/${name}.tar.bz2";
sha256 = "64ae790a7326893dc92f77c297862c4a74b1381c17b5fc559428fb7988421109";
};
buildNativeInputs = [ perl pkgconfig ];

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

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