Skip to content

(18.09) postgresql: Enable systemd integration for 9.6+ #51137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
domenkozar wants to merge 2 commits into from
Closed

(18.09) postgresql: Enable systemd integration for 9.6+ #51137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ca1654
postgresql: Enable systemd integration for 9.6+
domenkozar Nov 27, 2018
91dd703
postgresql: conditionalize systemd (on darwin)
domenkozar Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions nixos/modules/services/databases/postgresql.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@ in
User = "postgres";
Group = "postgres";
PermissionsStartOnly = true;
Type = if lib.versionAtLeast cfg.package.version "9.6"
then "notify"
else "simple";

# Shut down Postgres using SIGINT ("Fast Shutdown mode"). See
# http://www.postgresql.org/docs/current/static/server-shutdown.html
Expand Down
5 changes: 4 additions & 1 deletion pkgs/servers/sql/postgresql/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -16,6 +17,7 @@ let

buildInputs =
[ zlib readline openssl libxml2 makeWrapper ]
++ lib.optionals (atLeast "9.6" && !stdenv.isDarwin) [ systemd ]
++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];

enableParallelBuilding = true;
Expand All @@ -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")
];

Expand Down