diff options
| author | Aristid Breitkreuz <aristidb@gmail.com> | 2014-09-04 20:36:36 +0200 |
|---|---|---|
| committer | Aristid Breitkreuz <aristidb@gmail.com> | 2014-09-04 20:36:43 +0200 |
| commit | 73e569bf01facc9e65738f708ee2fff1e49ac61f (patch) | |
| tree | bfca2c04047cd65ffe8a08f61799a48bda86ae22 /pkgs | |
| parent | 0ec38e5b7f14790c05979120c1a60d77407f1432 (diff) | |
| download | nixlib-73e569bf01facc9e65738f708ee2fff1e49ac61f.tar nixlib-73e569bf01facc9e65738f708ee2fff1e49ac61f.tar.gz nixlib-73e569bf01facc9e65738f708ee2fff1e49ac61f.tar.bz2 nixlib-73e569bf01facc9e65738f708ee2fff1e49ac61f.tar.lz nixlib-73e569bf01facc9e65738f708ee2fff1e49ac61f.tar.xz nixlib-73e569bf01facc9e65738f708ee2fff1e49ac61f.tar.zst nixlib-73e569bf01facc9e65738f708ee2fff1e49ac61f.zip | |
add postgresql 9.4beta2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/sql/postgresql/9.4.x.nix | 44 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 58 insertions, 0 deletions
diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix new file mode 100644 index 000000000000..2608dcae5042 --- /dev/null +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, zlib, readline, libossp_uuid }: + +with stdenv.lib; + +let version = "9.4beta2"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; + + src = fetchurl { + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "131q3b9hv4pw02xhjsfi5is9i7pp5f4srxwfdn8ifs9qb37hcx2n"; + }; + + buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; + + enableParallelBuilding = true; + + makeFlags = [ "world" ]; + + configureFlags = 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 = { + homepage = http://www.postgresql.org/ ; + description = "A powerful, open source object-relational database system"; + license = stdenv.lib.licenses.postgresql; + maintainers = with stdenv.lib.maintainers; [ aristid ocharles ]; + hydraPlatforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch b/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch new file mode 100644 index 000000000000..fadeea90ac4b --- /dev/null +++ b/pkgs/servers/sql/postgresql/disable-resolve_symlinks-94.patch @@ -0,0 +1,12 @@ +--- a/src/common/exec.c 2014-09-04 20:19:12.236057588 +0200 ++++ b/src/common/exec.c 2014-09-04 20:19:50.550251633 +0200 +@@ -218,6 +218,9 @@ + static int + resolve_symlinks(char *path) + { ++ // On NixOS we *want* stuff relative to symlinks. ++ return 0; ++ + #ifdef HAVE_READLINK + struct stat buf; + char orig_wd[MAXPGPATH], diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af3980aff7e4..c6e896163129 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7095,6 +7095,8 @@ let postgresql93 = callPackage ../servers/sql/postgresql/9.3.x.nix { }; + postgresql94 = callPackage ../servers/sql/postgresql/9.4.x.nix { }; + postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; |