mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 12:38:41 +03:00
reverting -r17404 - the patch I should have kept private
svn path=/nixpkgs/trunk/; revision=17408
This commit is contained in:
parent
f9035543d5
commit
a5fdba90e2
@ -1,41 +1,13 @@
|
|||||||
{ stdenv, fetchurl, lib, aterm, db4, perl, curl, bzip2, openssl ? null
|
{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
|
||||||
, storeDir ? "/nix/store"
|
, storeDir ? "/nix/store"
|
||||||
, stateDir ? "/nix/var"
|
, stateDir ? "/nix/var"
|
||||||
, supportOldDBs ? true
|
, supportOldDBs ? true
|
||||||
, nameSuffix ? ""
|
, nameSuffix ? ""
|
||||||
, debugcCoercionFailuresPatch ? false
|
|
||||||
/* enabling this experimental patch will output a xml representation of the
|
|
||||||
thing which didn't match the expected type - for debugging only
|
|
||||||
|
|
||||||
The message of
|
|
||||||
let a = {}; in builtins.substring a a a; # always cause failure
|
|
||||||
looks like
|
|
||||||
|
|
||||||
value is an attribute set while an integer was expected
|
|
||||||
<?xml version='1.0' encoding='utf-8'?>
|
|
||||||
<expr>
|
|
||||||
<attrs>
|
|
||||||
</attrs>
|
|
||||||
</expr>
|
|
||||||
*/
|
|
||||||
, patches ? []
|
, patches ? []
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
let
|
name = "nix-0.13pre17232${nameSuffix}";
|
||||||
|
|
||||||
|
|
||||||
allPatches =
|
|
||||||
patches ++ lib.optional debugcCoercionFailuresPatch
|
|
||||||
(fetchurl { url = http://mawercer.de/~marc/debug-coercion-failures.patch; sha256 = "13q6vbxp3p36hqzlfp0hw84n6f1hzljnxqy73vr2bmglp8np24wy"; });
|
|
||||||
|
|
||||||
vName = "nix-0.13pre17232";
|
|
||||||
name = "${vName}${nameSuffix}${if allPatches == [] then "" else "-patched"}";
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
|
|
||||||
inherit name;
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://hydra.nixos.org/build/75293/download/4/${name}.tar.bz2";
|
url = "http://hydra.nixos.org/build/75293/download/4/${name}.tar.bz2";
|
||||||
@ -61,5 +33,5 @@ stdenv.mkDerivation {
|
|||||||
license = "LGPL";
|
license = "LGPL";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = allPatches;
|
inherit patches;
|
||||||
}
|
}
|
||||||
|
@ -8341,7 +8341,7 @@ let
|
|||||||
|
|
||||||
# The bleeding edge.
|
# The bleeding edge.
|
||||||
nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
|
nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
|
||||||
inherit fetchurl stdenv lib perl curl bzip2 openssl;
|
inherit fetchurl stdenv perl curl bzip2 openssl;
|
||||||
aterm = aterm242fixes;
|
aterm = aterm242fixes;
|
||||||
db4 = db45;
|
db4 = db45;
|
||||||
supportOldDBs = getPkgConfig "nix" "OldDBSupport" true;
|
supportOldDBs = getPkgConfig "nix" "OldDBSupport" true;
|
||||||
|
Loading…
Reference in New Issue
Block a user