diff options
| author | Peter Simons <simons@cryp.to> | 2019-10-02 20:02:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 20:02:25 +0200 |
| commit | 8cd5aa8a82367eeedbd0261f6d040a106e2a844a (patch) | |
| tree | 018be43504139019fa46fe1e69639c500e10288b /nixos | |
| parent | c18e6fb510653e72a093e65ef33ad9354db9b1e5 (diff) | |
| parent | e557ad74ac725a56d736a2f900495278770e8fad (diff) | |
| download | nixpkgs-8cd5aa8a82367eeedbd0261f6d040a106e2a844a.tar nixpkgs-8cd5aa8a82367eeedbd0261f6d040a106e2a844a.tar.gz nixpkgs-8cd5aa8a82367eeedbd0261f6d040a106e2a844a.tar.bz2 nixpkgs-8cd5aa8a82367eeedbd0261f6d040a106e2a844a.tar.lz nixpkgs-8cd5aa8a82367eeedbd0261f6d040a106e2a844a.tar.xz nixpkgs-8cd5aa8a82367eeedbd0261f6d040a106e2a844a.tar.zst nixpkgs-8cd5aa8a82367eeedbd0261f6d040a106e2a844a.zip | |
Merge pull request #69194 from danbst/pg11-nixos
nixos/postgresql: switch default 9.6 -> 11
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2003.xml | 5 | ||||
| -rw-r--r-- | nixos/modules/services/databases/postgresql.nix | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 2bbc42bbec6..6de0214b1fb 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 7bba4dacddc..3bedfe96a18 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 "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."); |