diff options
| author | danbst <abcz2.uprola@gmail.com> | 2019-09-22 12:27:39 +0300 |
|---|---|---|
| committer | danbst <abcz2.uprola@gmail.com> | 2019-09-22 12:27:39 +0300 |
| commit | e557ad74ac725a56d736a2f900495278770e8fad (patch) | |
| tree | ccca07db9b8492bde22eb73ae5916396e65f32e9 | |
| parent | fb863fceeace07cf4ce8632ccdce6f3614ff9a9d (diff) | |
| download | nixlib-e557ad74ac725a56d736a2f900495278770e8fad.tar nixlib-e557ad74ac725a56d736a2f900495278770e8fad.tar.gz nixlib-e557ad74ac725a56d736a2f900495278770e8fad.tar.bz2 nixlib-e557ad74ac725a56d736a2f900495278770e8fad.tar.lz nixlib-e557ad74ac725a56d736a2f900495278770e8fad.tar.xz nixlib-e557ad74ac725a56d736a2f900495278770e8fad.tar.zst nixlib-e557ad74ac725a56d736a2f900495278770e8fad.zip | |
move from 19.09 to 20.03
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1909.xml | 7 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 5 | ||||
| -rw-r--r-- | nixos/modules/services/databases/postgresql.nix | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 9aa992766a2f..58ab7207f533 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -34,13 +34,6 @@ </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/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index c84bc8dbb379..004a4135913d 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -23,6 +23,11 @@ Support is planned until the end of October 2020, handing over to 20.09. </para> </listitem> + <listitem> + <para> + Postgresql for NixOS service now defaults to v11. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index a19eb820a9c3..3bedfe96a180 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -226,7 +226,7 @@ in # Note: when changing the default, make it conditional on # ‘system.stateVersion’ to maintain compatibility with existing # systems! - mkDefault (if versionAtLeast config.system.stateVersion "19.09" then pkgs.postgresql_11 + mkDefault (if versionAtLeast config.system.stateVersion "20.03" 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."); |