From bf2d040432f7a98c67c124141928d748e3e721bd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 24 Jul 2024 10:43:02 +0200 Subject: [PATCH] postgresql: 15 -> 16 for 24.11+ Upgrade default postgresql for stateVersion >=24.11. This also rebuilds all packages linking against `libpq.so` to use postgresql 16. After re-reading https://www.postgresql.org/docs/16/release-16.html I don't see any major risks about doing that. --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++ nixos/modules/services/databases/postgresql.nix | 3 ++- pkgs/top-level/all-packages.nix | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 350498dfde18..a3925937c3e4 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -10,6 +10,8 @@ This also allows configuring runtime settings of AMDVLK and enabling experimental features. - The `moonlight-qt` package ([Moonlight game streaming](https://moonlight-stream.org/)) now has HDR support on Linux systems. +- PostgreSQL now defaults to major version 16. + - `authelia` has been upgraded to version 4.38. This version brings several features and improvements which are detailed in the [release blog post](https://www.authelia.com/blog/4.38-release-notes/). This release also deprecates some configuration keys, which are likely to be removed in future version 5.0, but they are still supported and expected to be working in the current version. diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 8a9d8c210b34..55b3dd282ec4 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -483,7 +483,8 @@ in services.postgresql.package = let mkThrow = ver: throw "postgresql_${ver} was removed, please upgrade your postgresql version."; - base = if versionAtLeast config.system.stateVersion "23.11" then pkgs.postgresql_15 + base = if versionAtLeast config.system.stateVersion "24.11" then pkgs.postgresql_16 + else if versionAtLeast config.system.stateVersion "23.11" then pkgs.postgresql_15 else if versionAtLeast config.system.stateVersion "22.05" then pkgs.postgresql_14 else if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13 else if versionAtLeast config.system.stateVersion "20.03" then mkThrow "11" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5097136c3a8f..737f8d6d82ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25942,20 +25942,20 @@ with pkgs; postgresql_15_jit postgresql_16_jit ; - postgresql = postgresql_15; - postgresql_jit = postgresql_15_jit; + postgresql = postgresql_16; + postgresql_jit = postgresql_16_jit; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs; postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs; - postgresql16Packages = recurseIntoAttrs postgresql_16.pkgs; + postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs; postgresql12JitPackages = recurseIntoAttrs postgresql_12_jit.pkgs; postgresql13JitPackages = recurseIntoAttrs postgresql_13_jit.pkgs; postgresql14JitPackages = recurseIntoAttrs postgresql_14_jit.pkgs; postgresql15JitPackages = recurseIntoAttrs postgresql_15_jit.pkgs; postgresql16JitPackages = recurseIntoAttrs postgresql_16_jit.pkgs; - postgresql15Packages = postgresqlPackages; + postgresql16Packages = postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };