Revert "postgresql: 9.3.6 -> 9.3.7"

This reverts commit 5486c08dc27c5cdc7b251adf6d50d306501ba3b1.
This commit is contained in:
Eelco Dolstra 2015-06-01 21:15:43 +02:00
parent f4b5cd8dde
commit ef5647d757
2 changed files with 41 additions and 9 deletions

View File

@ -1,11 +1,44 @@
{ callPackage, fetchurl, ... } @ args: { stdenv, fetchurl, zlib, readline, libossp_uuid, openssl}:
callPackage ./generic.nix (args // rec { with stdenv.lib;
psqlSchema = "9.3";
version = "${psqlSchema}.7"; let version = "9.3.6"; in
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 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; sha256 = "056ass7nnfyv7blv02anv795kgpz77gipdpxggd835cdwrhwns13";
}; };
})
buildInputs = [ zlib readline openssl ]
++ optionals (!stdenv.isDarwin) [ libossp_uuid ];
enableParallelBuilding = true;
makeFlags = [ "world" ];
configureFlags = [ "--with-openssl" ]
++ optional (!stdenv.isDarwin) "--with-ossp-uuid";
patches = [ ./disable-resolve_symlinks.patch ./less-is-more.patch ];
installTargets = [ "install-world" ];
LC_ALL = "C";
passthru = {
inherit readline;
psqlSchema = "9.3";
};
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

@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
(mkEnable true "integer-datetimes" null) (mkEnable true "integer-datetimes" null)
(mkEnable true "nls" null) (mkEnable true "nls" null)
(mkWith true "pgport" "5432") (mkWith true "pgport" "5432")
(mkEnable true "shared" null)
(mkEnable true "rpath" null) (mkEnable true "rpath" null)
(mkEnable true "spinlocks" null) (mkEnable true "spinlocks" null)
(mkEnable false "debug" null) (mkEnable false "debug" null)
@ -82,8 +83,6 @@ stdenv.mkDerivation rec {
(mkWith (optZlib != null) "zlib" null) (mkWith (optZlib != null) "zlib" null)
] ++ optionals (versionAtLeast version "9.1.0") [ ] ++ optionals (versionAtLeast version "9.1.0") [
(mkWith false "selinux" null) (mkWith false "selinux" null)
] ++ optionals (versionOlder version "9.3.0") [
(mkEnable true "shared" null)
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;