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: dd269b462897
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d0d099266efa
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 21, 2019

  1. postgresql: fix regression in NixOS after update to 11.2 (#56146) 

    ryantm bot updates `psqlSchema` alongside with version: #50646, #55860
but `psqlSchema` is used to generate `stateDir`. It shouldn't be updated.

Ideally it should be equal to postgresql major version for pg versions,
but we already have deployments in /var/lib/postgresql/11.1. Strange why
nobody complained when it was changed from 11.0 -> 11.1.

I propose do correct naming for PG12+, but status quo for current versions.

Fixes #56134
    @danbst
    danbst authored Feb 21, 2019
    Copy the full SHA
    d0d0992 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/servers/sql/postgresql/default.nix
4 changes: 2 additions & 2 deletions pkgs/servers/sql/postgresql/default.nix
View file
Original file line number Diff line number Diff line change
@@ -182,15 +182,15 @@ in self: {

postgresql_10 = self.callPackage generic {
version = "10.6";
psqlSchema = "10.0";
psqlSchema = "10.0"; # should be 10, but changing it is invasive
sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38";
this = self.postgresql_10;
inherit self;
};

postgresql_11 = self.callPackage generic {
version = "11.2";
psqlSchema = "11.2";
psqlSchema = "11.1"; # should be 11, but changing it is invasive
sha256 = "01clq2lw0v83zh5dc89xdr3mmap0jr37kdkh401ph6f2177bjxi6";
this = self.postgresql_11;
inherit self;