postgresql: 17 -> 18
Now that 26.05 is branched off, we should bump PostgreSQL's default version to v18.
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- Create the first release note entry in this section!
|
||||
- The default PostgreSQL version for new NixOS installations (i.e. with `system.stateVersion >= 26.11`) is v18.
|
||||
|
||||
## New Modules {#sec-release-26.11-new-modules}
|
||||
|
||||
|
||||
@@ -204,7 +204,9 @@ in
|
||||
type = types.package;
|
||||
example = literalExpression "pkgs.postgresql_15";
|
||||
defaultText = literalExpression ''
|
||||
if versionAtLeast config.system.stateVersion "25.11" then
|
||||
if versionAtLeast config.system.stateVersion "26.11" then
|
||||
pkgs.postgresql_18
|
||||
else if versionAtLeast config.system.stateVersion "25.11" then
|
||||
pkgs.postgresql_17
|
||||
else if versionAtLeast config.system.stateVersion "24.11" then
|
||||
pkgs.postgresql_16
|
||||
@@ -657,7 +659,9 @@ in
|
||||
'';
|
||||
base =
|
||||
# XXX Don't forget to keep `defaultText` of `services.postgresql.package` up to date!
|
||||
if versionAtLeast config.system.stateVersion "25.11" then
|
||||
if versionAtLeast config.system.stateVersion "26.11" then
|
||||
pkgs.postgresql_18
|
||||
else if versionAtLeast config.system.stateVersion "25.11" then
|
||||
pkgs.postgresql_17
|
||||
else if versionAtLeast config.system.stateVersion "24.11" then
|
||||
pkgs.postgresql_16
|
||||
|
||||
@@ -8096,8 +8096,8 @@ with pkgs;
|
||||
postgresql_17_jit
|
||||
postgresql_18_jit
|
||||
;
|
||||
postgresql = postgresql_17;
|
||||
postgresql_jit = postgresql_17_jit;
|
||||
postgresql = postgresql_18;
|
||||
postgresql_jit = postgresql_18_jit;
|
||||
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
|
||||
postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs;
|
||||
postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs;
|
||||
|
||||
Reference in New Issue
Block a user