diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-24 18:01:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-24 18:01:04 +0000 |
| commit | 859acbc1bc439bdb3d7a55001f754b1b9b30a7f6 (patch) | |
| tree | 053941b269c6b97541196b1ed1233d1e0eba594a /nixos | |
| parent | 935113fe43940c5a65e4ee85df4bb63a4761e456 (diff) | |
| parent | 26edbe155b550a54714a8bc727c176362aa5f4f5 (diff) | |
| download | nixpkgs-859acbc1bc439bdb3d7a55001f754b1b9b30a7f6.tar nixpkgs-859acbc1bc439bdb3d7a55001f754b1b9b30a7f6.tar.gz nixpkgs-859acbc1bc439bdb3d7a55001f754b1b9b30a7f6.tar.bz2 nixpkgs-859acbc1bc439bdb3d7a55001f754b1b9b30a7f6.tar.lz nixpkgs-859acbc1bc439bdb3d7a55001f754b1b9b30a7f6.tar.xz nixpkgs-859acbc1bc439bdb3d7a55001f754b1b9b30a7f6.tar.zst nixpkgs-859acbc1bc439bdb3d7a55001f754b1b9b30a7f6.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 5 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 2 | ||||
| -rw-r--r-- | nixos/modules/services/databases/postgresql.nix | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 3695997f717..cc3b5cbd29e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -32,6 +32,11 @@ from Python 3.8. </para> </listitem> + <listitem> + <para> + PostgreSQL now defaults to major version 13. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-new-services"> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index cc5b6bf81ee..5c27dba5fe0 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -11,6 +11,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `python3` now defaults to Python 3.9, updated from Python 3.8. +- PostgreSQL now defaults to major version 13. + ## New Services {#sec-release-21.11-new-services} - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index effc9182472..fd4a195787f 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -293,7 +293,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 "20.03" then pkgs.postgresql_11 + mkDefault (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 pkgs.postgresql_9_6 else throw "postgresql_9_5 was removed, please upgrade your postgresql version."); |