Skip to content

Commit

Permalink
postgresql: remove deprecated enableSystemd override
Browse files Browse the repository at this point in the history
This was deprecated in e6bfabf, where
we agreed on removing this after one release in [1].

Time has come!

[1]: NixOS#292993 (comment)
  • Loading branch information
wolfgangwalther committed Sep 26, 2024
1 parent a7fdf22 commit 6178e9b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2411.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@

- The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver.

- `postgresql` no longer accepts the `enableSystemd` override. Use `systemdSupport` instead.

- The dhcpcd service (`networking.useDHCP`) has been hardened and now runs exclusively as the "dhcpcd" user.
Users that were relying on the root privileges in `networking.dhcpcd.runHook` will have to write specific [sudo](security.sudo.extraRules) or [polkit](security.polkit.extraConfig) rules to allow dhcpcd to perform privileged actions.

Expand Down
7 changes: 2 additions & 5 deletions pkgs/servers/sql/postgresql/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ let
, removeReferencesTo, writeShellApplication

, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs
, enableSystemd ? null
, gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic

# for postgresql.pkgs
Expand Down Expand Up @@ -43,8 +42,6 @@ let

dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary;

systemdSupport' = if enableSystemd == null then systemdSupport else (lib.warn "postgresql: argument enableSystemd is deprecated, please use systemdSupport instead." enableSystemd);

pname = "postgresql";

stdenv' =
Expand Down Expand Up @@ -107,7 +104,7 @@ let
++ lib.optionals jitSupport [ llvmPackages.llvm ]
++ lib.optionals lz4Enabled [ lz4 ]
++ lib.optionals zstdEnabled [ zstd ]
++ lib.optionals systemdSupport' [ systemdLibs ]
++ lib.optionals systemdSupport [ systemdLibs ]
++ lib.optionals pythonSupport [ python3 ]
++ lib.optionals gssSupport [ libkrb5 ]
++ lib.optionals stdenv'.hostPlatform.isLinux [ linux-pam ];
Expand Down Expand Up @@ -143,7 +140,7 @@ let
"--sysconfdir=/etc"
"--with-system-tzdata=${tzdata}/share/zoneinfo"
"--enable-debug"
(lib.optionalString systemdSupport' "--with-systemd")
(lib.optionalString systemdSupport "--with-systemd")
"--with-uuid=e2fs"
] ++ lib.optionals lz4Enabled [ "--with-lz4" ]
++ lib.optionals zstdEnabled [ "--with-zstd" ]
Expand Down

0 comments on commit 6178e9b

Please sign in to comment.