Merge pull request #171459 from ivan/postgresql-is-14
nixos/postgresql: use postgres 14 for 22.05
This commit is contained in:
commit
9457a82e42
|
@ -116,6 +116,11 @@
|
||||||
have been removed.
|
have been removed.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
PostgreSQL now defaults to major version 14.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
The new
|
The new
|
||||||
|
|
|
@ -45,6 +45,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;`.
|
- 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.
|
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.
|
- 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.
|
- [`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.
|
||||||
|
|
|
@ -295,7 +295,8 @@ in
|
||||||
# Note: when changing the default, make it conditional on
|
# Note: when changing the default, make it conditional on
|
||||||
# ‘system.stateVersion’ to maintain compatibility with existing
|
# ‘system.stateVersion’ to maintain compatibility with existing
|
||||||
# systems!
|
# 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 "20.03" then pkgs.postgresql_11
|
||||||
else if versionAtLeast config.system.stateVersion "17.09" then mkThrow "9_6"
|
else if versionAtLeast config.system.stateVersion "17.09" then mkThrow "9_6"
|
||||||
else mkThrow "9_5");
|
else mkThrow "9_5");
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pg-safeupdate";
|
pname = "pg-safeupdate";
|
||||||
version = "1.2";
|
version = "1.4";
|
||||||
|
|
||||||
buildInputs = [ postgresql ];
|
buildInputs = [ postgresql ];
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||||
owner = "eradman";
|
owner = "eradman";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "010m57jcv5v8pyfm1cqs3a306y750lvnvla9m5d98v5vdx3349jg";
|
sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -22358,12 +22358,12 @@ with pkgs;
|
||||||
postgresql_13
|
postgresql_13
|
||||||
postgresql_14
|
postgresql_14
|
||||||
;
|
;
|
||||||
postgresql = postgresql_13.override { this = postgresql; };
|
postgresql = postgresql_14.override { this = postgresql; };
|
||||||
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
|
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
|
||||||
postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs;
|
postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs;
|
||||||
postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs;
|
postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs;
|
||||||
postgresql13Packages = postgresqlPackages;
|
postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs;
|
||||||
postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs;
|
postgresql14Packages = postgresqlPackages;
|
||||||
|
|
||||||
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
|
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue