mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 17:39:34 +00:00
nixUnstable: Updated to 1.1pre2714_2f3f413
This version brings systemd support and automatic log compression.
This commit is contained in:
parent
25bb1c640e
commit
d5bb10417e
pkgs
|
@ -5,11 +5,11 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "nix-1.0pre2668_46cdc6a";
|
name = "nix-1.1pre2714_2f3f413";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://hydra.nixos.org/build/2492261/download/4/${name}.tar.bz2";
|
url = "http://hydra.nixos.org/build/2724747/download/4/${name}.tar.bz2";
|
||||||
sha256 = "d9a1cfbee1670bc700593d81211c47eb8d7623aa9699d18a414ecaddccabfa1a";
|
sha256 = "ec026709405dfcbff387418c007915711312ac574c046c38798990666bd339a6";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildNativeInputs = [ perl pkgconfig ];
|
buildNativeInputs = [ perl pkgconfig ];
|
||||||
|
|
|
@ -8422,14 +8422,10 @@ let
|
||||||
stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
|
stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
|
||||||
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";
|
||||||
};
|
};
|
||||||
*/
|
|
||||||
|
|
||||||
nixUnstable = nixStable;
|
|
||||||
|
|
||||||
nixCustomFun = src: preConfigure: enableScripts: configureFlags:
|
nixCustomFun = src: preConfigure: enableScripts: configureFlags:
|
||||||
import ../tools/package-management/nix/custom.nix {
|
import ../tools/package-management/nix/custom.nix {
|
||||||
|
|
Loading…
Reference in a new issue