diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 21:17:33 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:50 +0200 |
commit | 05f1457c1e7bfa376e949ac196db0b0412faaa85 (patch) | |
tree | 293685429838a1754b0ccfa7d632139ad52ecebe /pkgs/servers/sql | |
parent | 5efd73fce6f3e07fb255c4ad895994402beb034a (diff) | |
download | nixlib-05f1457c1e7bfa376e949ac196db0b0412faaa85.tar nixlib-05f1457c1e7bfa376e949ac196db0b0412faaa85.tar.gz nixlib-05f1457c1e7bfa376e949ac196db0b0412faaa85.tar.bz2 nixlib-05f1457c1e7bfa376e949ac196db0b0412faaa85.tar.lz nixlib-05f1457c1e7bfa376e949ac196db0b0412faaa85.tar.xz nixlib-05f1457c1e7bfa376e949ac196db0b0412faaa85.tar.zst nixlib-05f1457c1e7bfa376e949ac196db0b0412faaa85.zip |
Revert "postgresql: Refactor 8.4 into generic"
This reverts commit 1bb67e514b2514b9267919784524821952cd73b3.
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r-- | pkgs/servers/sql/postgresql/8.4.x.nix | 31 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/generic.nix | 92 |
2 files changed, 26 insertions, 97 deletions
diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 66933f2ad420..4c72dbfd4484 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,10 +1,31 @@ -{ callPackage, fetchurl, ... } @ args: +{ stdenv, fetchurl, zlib, ncurses, readline, openssl }: -callPackage ./generic.nix (args // rec { - version = "8.4.22"; +let version = "8.4.22"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; src = fetchurl { - url = "mirror://postgresql/source/v${version}/postgresql-${version}.tar.bz2"; + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; sha256 = "09iqr9sldiq7jz1rdnywp2wv36lxy5m8kch3vpchd1s4fz75c7aw"; }; -}) + + buildInputs = [ zlib ncurses readline openssl ]; + + LC_ALL = "C"; + + configureFlags = [ "--with-openssl" ]; + + patches = [ ./less-is-more.patch ]; + + passthru = { inherit readline; }; + + 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 deleted file mode 100644 index d7fd28ccb689..000000000000 --- a/pkgs/servers/sql/postgresql/generic.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, bison, flex -, gettext - -# Optional Dependencies -, kerberos ? null, pam ? null, openldap ? null, openssl ? null, readline ? null -, libossp_uuid ? null, libxml2 ? null, libxslt ? null, zlib ? null - -# Extra Arguments -, blockSizeKB ? 8, segmentSizeGB ? 1 -, walBlockSizeKB ? 8, walSegmentSizeMB ? 16 - -# Version specific arguments -, version, src -, ... -}: - -with stdenv; -let - optKerberos = shouldUsePkg kerberos; - optPam = shouldUsePkg pam; - optOpenldap = shouldUsePkg openldap; - optOpenssl = shouldUsePkg openssl; - optReadline = shouldUsePkg readline; - optLibossp_uuid = shouldUsePkg libossp_uuid; - optLibxml2 = shouldUsePkg libxml2; - optLibxslt = shouldUsePkg libxslt; - optZlib = shouldUsePkg zlib; -in -with stdenv.lib; -stdenv.mkDerivation rec { - name = "postgresql-${version}"; - - inherit src; - - patches = [ ./less-is-more.patch ]; - - nativeBuildInputs = [ bison flex ]; - buildInputs = [ - gettext optKerberos optPam optOpenldap optOpenssl optReadline - optLibossp_uuid optLibxml2 optLibxslt optZlib - ]; - - #LC_ALL = "C"; - - configureFlags = [ - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - (mkEnable true "integer-datetimes" null) - (mkEnable true "nls" null) - (mkWith true "pgport" "5432") - (mkEnable true "shared" null) - (mkEnable true "rpath" null) - (mkEnable true "spinlocks" null) - (mkEnable false "debug" null) - (mkEnable false "profiling" null) - (mkEnable false "coverage" null) - (mkEnable false "dtrace" null) - (mkWith true "blocksize" (toString blockSizeKB)) - (mkWith true "segsize" (toString segmentSizeGB)) - (mkWith true "wal-blocksize" (toString walBlockSizeKB)) - (mkWith true "wal-segsize" (toString walSegmentSizeMB)) - (mkEnable true "autodepend" null) - (mkEnable false "cassert" null) - (mkEnable true "thread-safety" null) - (mkWith false "tcl" null) # Maybe enable some day - (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) - ]; - - 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; - }; - - passthru = { inherit readline; }; -} |