From 96a8c0ac23c1aca2c6542c85b95ed29b444f4597 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Tue, 3 May 2022 22:23:08 +0000 Subject: [PATCH 1/2] nixos/postgresql: use postgres 14 for 22.05 postgresql: alias to postgresql_14 --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 5 +++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ nixos/modules/services/databases/postgresql.nix | 3 ++- pkgs/top-level/all-packages.nix | 6 +++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 1e3f269dafb..c6ac5928d1e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -89,6 +89,11 @@ have been removed. + + + PostgreSQL now defaults to major version 14. + + The new diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index dcfabf01ff3..b10c11bc4f4 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -30,6 +30,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Pulseaudio has been upgraded to version 15.0 and now optionally [supports additional Bluetooth audio codecs](https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters) like aptX or LDAC, with codec switching support being available in `pavucontrol`. This feature is disabled by default but can be enabled by using `hardware.pulseaudio.package = pkgs.pulseaudioFull;`. Existing 3rd party modules that provided similar functionality, like `pulseaudio-modules-bt` or `pulseaudio-hsphfpd` are deprecated and have been removed. +- PostgreSQL now defaults to major version 14. + - The new [`postgresqlTestHook`](https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook) runs a PostgreSQL server for the duration of package checks. - [`kops`](https://kops.sigs.k8s.io) defaults to 1.22.4, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes 1.22. This will increase security by default, but may break some types of workloads. See the [release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) for details. diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 2919022496a..550bd36efff 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -295,7 +295,8 @@ in # Note: when changing the default, make it conditional on # ‘system.stateVersion’ to maintain compatibility with existing # systems! - mkDefault (if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13 + mkDefault (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 pkgs.postgresql_11 else if versionAtLeast config.system.stateVersion "17.09" then mkThrow "9_6" else mkThrow "9_5"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a5abce5cfb..0c27fffe84e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22342,12 +22342,12 @@ with pkgs; postgresql_13 postgresql_14 ; - postgresql = postgresql_13.override { this = postgresql; }; + postgresql = postgresql_14.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; - postgresql13Packages = postgresqlPackages; - postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs; + postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs; + postgresql14Packages = postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; From c6a4414766547f32ba4b70261c42db3578ddafff Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Wed, 11 May 2022 23:50:44 +0000 Subject: [PATCH 2/2] postgresqlPackages.pg_safeupdate: 1.2 -> 1.4 This fixes the build with PostgreSQL 14. --- pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index b2a58b6bc3e..5e9976c014d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg-safeupdate"; - version = "1.2"; + version = "1.4"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "eradman"; repo = pname; rev = version; - sha256 = "010m57jcv5v8pyfm1cqs3a306y750lvnvla9m5d98v5vdx3349jg"; + sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; }; installPhase = ''