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: 5d1abc68e7b1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 84f7c6f98c89
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Sep 7, 2019

  1. postgresql_9_4: Remove package 

    It's only supported until February 13, 2020 which is during the 19.09 life cycle.
    @adisbladis
    adisbladis committed Sep 7, 2019
    Copy the full SHA
    8e2fc57 View commit details

  2. Merge pull request #68268 from adisbladis/postgresql-9_4 

    postgresql_9_4: Remove package
    @globin
    globin authored Sep 7, 2019
    Copy the full SHA
    84f7c6f View commit details
5 changes: 5 additions & 0 deletions nixos/doc/manual/release-notes/rl-1909.xml
View file
Original file line number Diff line number Diff line change
@@ -204,6 +204,11 @@
accordingly.
</para>
</listitem>
<listitem>
<para>
PostgreSQL 9.4 is scheduled EOL during the 19.09 life cycle and has been removed.
</para>
</listitem>
<listitem>
<para>
The options <option>services.prometheus.alertmanager.user</option> and
2 changes: 1 addition & 1 deletion nixos/modules/services/databases/postgresql.nix
View file
Original file line number Diff line number Diff line change
@@ -228,7 +228,7 @@ in
# systems!
mkDefault (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 pkgs.postgresql_9_4);
else throw "postgresql_9_4 was removed, please upgrade your postgresql version.");

services.postgresql.dataDir =
mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
8 changes: 0 additions & 8 deletions pkgs/servers/sql/postgresql/default.nix
View file
Original file line number Diff line number Diff line change
@@ -168,14 +168,6 @@ let

in self: {

postgresql_9_4 = self.callPackage generic {
version = "9.4.24";
psqlSchema = "9.4";
sha256 = "0acl1wmah3r1a0qjjmpc256glccrjnzq4pkwklx4d9s6vmkks9aj";
this = self.postgresql_9_4;
inherit self;
};

postgresql_9_5 = self.callPackage generic {
version = "9.5.19";
psqlSchema = "9.5";
1 change: 0 additions & 1 deletion pkgs/top-level/aliases.nix
View file
Original file line number Diff line number Diff line change
@@ -265,7 +265,6 @@ mapAliases ({
plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22
pmtools = acpica-tools; # added 2018-11-01
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
postgresql94 = postgresql_9_4;
postgresql95 = postgresql_9_5;
postgresql96 = postgresql_9_6;
postgresql100 = throw "deprecated 2018-10-21: use postgresql_10 instead";
3 changes: 0 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -14979,8 +14979,6 @@ in

pgbouncer = callPackage ../servers/sql/pgbouncer { };

pgpool94 = pgpool.override { postgresql = postgresql_9_4; };

pgpool = callPackage ../servers/sql/pgpool {
pam = if stdenv.isLinux then pam else null;
libmemcached = null; # Detection is broken upstream
@@ -14991,7 +14989,6 @@ in
timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };

inherit (import ../servers/sql/postgresql pkgs)
postgresql_9_4
postgresql_9_5
postgresql_9_6
postgresql_10