Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c18e6fb51065
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8cd5aa8a8236
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 21, 2019

  1. nixos/postgresql: switch default 9.6 -> 11 

    This is designed for 19.09 release.
    @danbst
    danbst committed Sep 21, 2019

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: 063CCCAD04182D32
    Expired
    Learn about vigilant mode
    Copy the full SHA
    fb863fc View commit details

Commits on Sep 22, 2019

  1. move from 19.09 to 20.03

    @danbst
    danbst committed Sep 22, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e557ad7 View commit details

Commits on Oct 2, 2019

  1. Merge pull request #69194 from danbst/pg11-nixos 

    nixos/postgresql: switch default 9.6 -> 11
    @peti
    peti authored Oct 2, 2019
    Copy the full SHA
    8cd5aa8 View commit details
Showing with 7 additions and 1 deletion.
  1. +5 −0 nixos/doc/manual/release-notes/rl-2003.xml
  2. +2 −1 nixos/modules/services/databases/postgresql.nix
5 changes: 5 additions & 0 deletions nixos/doc/manual/release-notes/rl-2003.xml
View file
Original file line number Diff line number Diff line change
@@ -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>

3 changes: 2 additions & 1 deletion nixos/modules/services/databases/postgresql.nix
View file
Original file line number Diff line number Diff line change
@@ -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.");