diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 21:12:25 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:48 +0200 |
commit | c82da1ece689bfb6f18d8019ef0e64c67590c6b3 (patch) | |
tree | f8feb99bcad41e187533f012a5119ea6c83fac13 /pkgs/servers | |
parent | aa2a0ff1d8899586b9d7d04d1f159640192b237d (diff) | |
download | nixlib-c82da1ece689bfb6f18d8019ef0e64c67590c6b3.tar nixlib-c82da1ece689bfb6f18d8019ef0e64c67590c6b3.tar.gz nixlib-c82da1ece689bfb6f18d8019ef0e64c67590c6b3.tar.bz2 nixlib-c82da1ece689bfb6f18d8019ef0e64c67590c6b3.tar.lz nixlib-c82da1ece689bfb6f18d8019ef0e64c67590c6b3.tar.xz nixlib-c82da1ece689bfb6f18d8019ef0e64c67590c6b3.tar.zst nixlib-c82da1ece689bfb6f18d8019ef0e64c67590c6b3.zip |
Revert "postgresql: 9.4.1 -> 9.4.2"
This reverts commit 6775c0696f9e8b2c148f9be382f30bce7a4ec4a0.
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/sql/postgresql/9.4.x.nix | 47 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/generic.nix | 8 |
2 files changed, 42 insertions, 13 deletions
diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index 0d8b573dcc56..73f416912a2a 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -1,11 +1,44 @@ -{ callPackage, fetchurl, ... } @ args: +{ stdenv, fetchurl, zlib, readline, libossp_uuid, openssl }: -callPackage ./generic.nix (args // rec { - psqlSchema = "9.4"; - version = "${psqlSchema}.2"; +with stdenv.lib; + +let version = "9.4.1"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; - sha256 = "04adpfg2f7ip96rh3jjygx5cpgasrrp1dl2wswjivfk5q68s3zc1"; + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "19n3i14bhmw8dacd2kl3n1wzj362qv3fjmal5vsvi580h9ybgp99"; + }; + + 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-94.patch ./less-is-more.patch ]; + + installTargets = [ "install-world" ]; + + LC_ALL = "C"; + + passthru = { + inherit readline; + psqlSchema = "9.4"; + }; + + 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; }; -}) +} diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index f8d1ad0a4754..88e2b77cf83c 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -69,12 +69,14 @@ stdenv.mkDerivation rec { (mkWith false "perl" null) # Maybe enable some day (mkWith false "python" null) # Maybe enable some day (mkWith (optKerberos != null) "gssapi" null) + (mkWith false "krb5" null) (mkWith (optPam != null) "pam" null) (mkWith (optOpenldap != null) "ldap" null) (mkWith false "bonjour" null) (mkWith (optOpenssl != null) "openssl" null) (mkWith (optReadline != null) "readline" null) (mkWith false "libedit-preferred" null) + (mkWith (optLibossp_uuid != null) "ossp-uuid" null) (mkWith (optLibxml2 != null) "libxml" null) (mkWith (optLibxslt != null) "libxslt" null) (mkWith (optZlib != null) "zlib" null) @@ -82,12 +84,6 @@ stdenv.mkDerivation rec { (mkWith false "selinux" null) ] ++ optionals (versionOlder version "9.3.0") [ (mkEnable true "shared" null) - ] ++ optionals (versionAtLeast version "9.4.0") [ - (mkEnable false "tap-tests" null) - (mkWith (optLibossp_uuid != null) "uuid" "ossp") - ] ++ optionals (versionOlder version "9.4.0") [ - (mkWith false "krb5" null) - (mkWith (optLibossp_uuid != null) "ossp-uuid" null) ]; enableParallelBuilding = true; |