diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 08:12:56 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 08:12:56 +0100 |
commit | 9db2421d1f65beb38911e8133349193db0042a1d (patch) | |
tree | 90a2f4a56cf871c74aad86138d85e9631c2c2f86 /pkgs/servers/sql | |
parent | 9caab8ff4a1ad36fbc0ab866f1b0f7c15d35ba90 (diff) | |
parent | 8d88e4f6c7b09fe811d92b346e5eafefe07a47c9 (diff) | |
download | nixpkgs-9db2421d1f65beb38911e8133349193db0042a1d.tar nixpkgs-9db2421d1f65beb38911e8133349193db0042a1d.tar.gz nixpkgs-9db2421d1f65beb38911e8133349193db0042a1d.tar.bz2 nixpkgs-9db2421d1f65beb38911e8133349193db0042a1d.tar.lz nixpkgs-9db2421d1f65beb38911e8133349193db0042a1d.tar.xz nixpkgs-9db2421d1f65beb38911e8133349193db0042a1d.tar.zst nixpkgs-9db2421d1f65beb38911e8133349193db0042a1d.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index ee302b48ee4..f802de9df9d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata }: +{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper, tzdata, systemd }: let common = { version, sha256, psqlSchema }: let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec { name = "postgresql-${version}"; + inherit version; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; @@ -16,9 +17,10 @@ let buildInputs = [ zlib readline openssl libxml2 makeWrapper ] + ++ lib.optionals (atLeast "9.6" && !stdenv.isDarwin) [ systemd ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; - enableParallelBuilding = true; + enableParallelBuilding = !stdenv.isDarwin; makeFlags = [ "world" ]; @@ -33,6 +35,7 @@ let "--sysconfdir=/etc" "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}/share/zoneinfo" + (lib.optionalString (atLeast "9.6" && !stdenv.isDarwin) "--with-systemd") (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ]; @@ -131,7 +134,7 @@ in { postgresql_11 = common { version = "11.1"; - psqlSchema = "11.0"; + psqlSchema = "11.1"; sha256 = "026v0sicsh7avzi45waf8shcbhivyxmi7qgn9fd1x0vl520mx0ch"; }; |