diff options
author | danbst <abcz2.uprola@gmail.com> | 2019-09-21 10:09:58 +0300 |
---|---|---|
committer | danbst <abcz2.uprola@gmail.com> | 2019-09-21 10:18:56 +0300 |
commit | fb863fceeace07cf4ce8632ccdce6f3614ff9a9d (patch) | |
tree | 307ea448ec10dc79ed42e83f88ef76bf85a41d3d /nixos | |
parent | 970145f051819bb4a527e8b3a3d2100ef2a985f6 (diff) | |
download | nixpkgs-fb863fceeace07cf4ce8632ccdce6f3614ff9a9d.tar nixpkgs-fb863fceeace07cf4ce8632ccdce6f3614ff9a9d.tar.gz nixpkgs-fb863fceeace07cf4ce8632ccdce6f3614ff9a9d.tar.bz2 nixpkgs-fb863fceeace07cf4ce8632ccdce6f3614ff9a9d.tar.lz nixpkgs-fb863fceeace07cf4ce8632ccdce6f3614ff9a9d.tar.xz nixpkgs-fb863fceeace07cf4ce8632ccdce6f3614ff9a9d.tar.zst nixpkgs-fb863fceeace07cf4ce8632ccdce6f3614ff9a9d.zip |
nixos/postgresql: switch default 9.6 -> 11
This is designed for 19.09 release.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1909.xml | 7 | ||||
-rw-r--r-- | nixos/modules/services/databases/postgresql.nix | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 58ab7207f53..9aa992766a2 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -34,6 +34,13 @@ </para> </listitem> <listitem> + <para> + Postgresql for NixOS service now defaults to v11. <literal>pkgs.postgresql</literal> is still 9.6, but + may be updated in future release. To prevent future update problems replace <literal>pkgs.postgresql</literal> + with an explicitly versioned <literal>pkgs.postgresql_9_6</literal>. + </para> + </listitem> + <listitem> <para> The binfmt module is now easier to use. Additional systems can be added through <option>boot.binfmt.emulatedSystems</option>. diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 7bba4dacddc..a19eb820a9c 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -226,7 +226,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 "17.09" then pkgs.postgresql_9_6 + mkDefault (if versionAtLeast config.system.stateVersion "19.09" then pkgs.postgresql_11 + else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6 else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5 else throw "postgresql_9_4 was removed, please upgrade your postgresql version."); |