forked from mirrors/nixpkgs
postgresql: Consolidate patches
This commit is contained in:
parent
d9efd0676f
commit
7174391e5b
|
@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
|
||||||
url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
|
url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
|
||||||
sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
|
sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./disable-resolve_symlinks.patch ];
|
|
||||||
})
|
})
|
||||||
|
|
|
@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
|
||||||
url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
|
url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
|
||||||
sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02";
|
sha256 = "0vxa90d1ghv6vg4c6kxvm2skypahvlq4sd968q7l9ff3dl145z02";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./disable-resolve_symlinks.patch ];
|
|
||||||
})
|
})
|
||||||
|
|
|
@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
|
||||||
url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
|
url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
|
||||||
sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
|
sha256 = "0mllj1r1648iwm0qj3cj9qxizhlyhqmz94iydnwhf48psvvy4r9b";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./disable-resolve_symlinks.patch ];
|
|
||||||
})
|
})
|
||||||
|
|
|
@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec {
|
||||||
url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
|
url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2";
|
||||||
sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5";
|
sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./disable-resolve_symlinks.patch ];
|
|
||||||
})
|
})
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
, walBlockSizeKB ? 8, walSegmentSizeMB ? 16
|
, walBlockSizeKB ? 8, walSegmentSizeMB ? 16
|
||||||
|
|
||||||
# Version specific arguments
|
# Version specific arguments
|
||||||
, psqlSchema , version, src, patches ? [ ]
|
, psqlSchema , version, src
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -25,8 +25,6 @@ let
|
||||||
optLibxml2 = shouldUsePkg libxml2;
|
optLibxml2 = shouldUsePkg libxml2;
|
||||||
optLibxslt = shouldUsePkg libxslt;
|
optLibxslt = shouldUsePkg libxslt;
|
||||||
optZlib = shouldUsePkg zlib;
|
optZlib = shouldUsePkg zlib;
|
||||||
|
|
||||||
patches' = [ ./less-is-more.patch ] ++ patches;
|
|
||||||
in
|
in
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -34,7 +32,13 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
||||||
patches = patches';
|
patches = [
|
||||||
|
./less-is-more.patch
|
||||||
|
] ++ optionals (versionOlder version "9.4.0") [
|
||||||
|
./disable-resolve_symlinks.patch
|
||||||
|
] ++ optionals (versionAtLeast version "9.4.0") [
|
||||||
|
./disable-resolve_symlinks-94.patch
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ bison flex ];
|
nativeBuildInputs = [ bison flex ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
Loading…
Reference in a new issue