JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
postgresql_9_4: Remove package
This commit is contained in:
Robin Gloster 2019-09-07 18:12:00 +02:00 committed by GitHub
commit 84f7c6f98c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/doc/manual/release-notes/rl-1909.xml
View File

@ -204,6 +204,11 @@
accordingly. accordingly.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
PostgreSQL 9.4 is scheduled EOL during the 19.09 life cycle and has been removed.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
The options <option>services.prometheus.alertmanager.user</option> and The options <option>services.prometheus.alertmanager.user</option> and

2
nixos/modules/services/databases/postgresql.nix
View File

@ -228,7 +228,7 @@ in
# systems! # systems!
mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6 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 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 = services.postgresql.dataDir =
mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}" mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"

8
pkgs/servers/sql/postgresql/default.nix
View File

@ -168,14 +168,6 @@ let
in self: { 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 { postgresql_9_5 = self.callPackage generic {
version = "9.5.19"; version = "9.5.19";
psqlSchema = "9.5"; psqlSchema = "9.5";

1
pkgs/top-level/aliases.nix
View File

@ -265,7 +265,6 @@ mapAliases ({
plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22 plexpy = tautulli; # plexpy got renamed to tautulli, added 2019-02-22
pmtools = acpica-tools; # added 2018-11-01 pmtools = acpica-tools; # added 2018-11-01
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
postgresql94 = postgresql_9_4;
postgresql95 = postgresql_9_5; postgresql95 = postgresql_9_5;
postgresql96 = postgresql_9_6; postgresql96 = postgresql_9_6;
postgresql100 = throw "deprecated 2018-10-21: use postgresql_10 instead"; postgresql100 = throw "deprecated 2018-10-21: use postgresql_10 instead";

3
pkgs/top-level/all-packages.nix
View File

@ -14979,8 +14979,6 @@ in
pgbouncer = callPackage ../servers/sql/pgbouncer { }; pgbouncer = callPackage ../servers/sql/pgbouncer { };
pgpool94 = pgpool.override { postgresql = postgresql_9_4; };
pgpool = callPackage ../servers/sql/pgpool { pgpool = callPackage ../servers/sql/pgpool {
pam = if stdenv.isLinux then pam else null; pam = if stdenv.isLinux then pam else null;
libmemcached = null; # Detection is broken upstream libmemcached = null; # Detection is broken upstream
@ -14991,7 +14989,6 @@ in
timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };
inherit (import ../servers/sql/postgresql pkgs) inherit (import ../servers/sql/postgresql pkgs)
postgresql_9_4
postgresql_9_5 postgresql_9_5
postgresql_9_6 postgresql_9_6
postgresql_10 postgresql_10