Revert "postgresql: 9.2.10 -> 9.2.11"

This reverts commit 601e713bb8.
This commit is contained in:
Eelco Dolstra 2015-06-01 21:16:07 +02:00
parent bcd9f792da
commit 4d0156025d
5 changed files with 39 additions and 20 deletions

View File

@ -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 ];
}) })

View File

@ -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 ];
}) })

View File

@ -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 ];
}) })

View File

@ -1,13 +1,40 @@
{ callPackage, fetchurl, ... } @ args: { stdenv, fetchurl, zlib, readline, openssl }:
callPackage ./generic.nix (args // rec { let version = "9.2.10"; in
psqlSchema = "9.2";
version = "${psqlSchema}.11"; stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
sha256 = "1k5i73ninqyz76zzpi06ajj5qawf30zwr16x8wrgq6swzvsgbck5"; sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m";
}; };
patches = [ ./disable-resolve_symlinks.patch ]; buildInputs = [ zlib readline openssl ];
})
enableParallelBuilding = true;
makeFlags = [ "world" ];
configureFlags = [ "--with-openssl" ];
patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
installTargets = [ "install-world" ];
LC_ALL = "C";
passthru = {
inherit readline;
psqlSchema = "9.2";
};
meta = with stdenv.lib; {
homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system";
license = licenses.postgresql;
maintainers = with maintaiers; [ ocharles ];
platforms = platforms.unix;
hydraPlatforms = platforms.linux;
};
}

View File

@ -10,7 +10,7 @@
, walBlockSizeKB ? 8, walSegmentSizeMB ? 16 , walBlockSizeKB ? 8, walSegmentSizeMB ? 16
# Version specific arguments # Version specific arguments
, psqlSchema , version, src, patches ? [ ] , version, src, psqlSchema
, ... , ...
}: }:
@ -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,7 @@ stdenv.mkDerivation rec {
inherit src; inherit src;
patches = patches'; patches = [ ./less-is-more.patch ];
nativeBuildInputs = [ bison flex ]; nativeBuildInputs = [ bison flex ];
buildInputs = [ buildInputs = [
@ -42,6 +40,8 @@ stdenv.mkDerivation rec {
optLibossp_uuid optLibxml2 optLibxslt optZlib optLibossp_uuid optLibxml2 optLibxslt optZlib
]; ];
#LC_ALL = "C";
configureFlags = [ configureFlags = [
(mkOther "sysconfdir" "/etc") (mkOther "sysconfdir" "/etc")
(mkOther "localstatedir" "/var") (mkOther "localstatedir" "/var")
@ -81,8 +81,6 @@ stdenv.mkDerivation rec {
(mkWith false "selinux" null) (mkWith false "selinux" null)
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.postgresql.org/; homepage = http://www.postgresql.org/;
description = "A powerful, open source object-relational database system"; description = "A powerful, open source object-relational database system";