Merge pull request #69194 from danbst/pg11-nixos

tjh.dev / nixpkgs

fork atom

Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

fork atom

nixos/postgresql: switch default 9.6 -> 11

authored by

Peter Simons and committed by

GitHub 6 years ago 8cd5aa8a c18e6fb5

+7 -1

2 changed files

expand all

unified split

nixos

doc

manual

release-notes

rl-2003.xml

modules

services

databases

postgresql.nix

nixos/doc/manual/release-notes/rl-2003.xml

··· 23 23 Support is planned until the end of October 2020, handing over to 20.09. 24 24 </para> 25 25 </listitem> 26 + <listitem> 27 + <para> 28 + Postgresql for NixOS service now defaults to v11. 29 + </para> 30 + </listitem> 26 31 </itemizedlist> 27 32 </section> 28 33

+2 -1

nixos/modules/services/databases/postgresql.nix

··· 226 226 # Note: when changing the default, make it conditional on 227 227 # ‘system.stateVersion’ to maintain compatibility with existing 228 228 # systems! 229 - mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6 229 + mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11 230 + else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6 230 231 else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5 231 232 else throw "postgresql_9_4 was removed, please upgrade your postgresql version."); 232 233