mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues Wiki Activity

Merge pull request #119389 from marsam/drop-postgresql_9_5

Browse source 
postgresql_9_5: drop
This commit is contained in:
Jörg Thalheim 2021-04-16 19:29:21 +01:00 committed by GitHub
parent a09a5943b2 72ab382fb6
commit 0854659567
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-2105.xml
View file

@ -955,6 +955,11 @@ environment.systemPackages = [
<link linkend="opt-boot.extraSystemdUnitPaths">boot.extraSystemdUnitPaths</link> list. <link linkend="opt-boot.extraSystemdUnitPaths">boot.extraSystemdUnitPaths</link> list.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
PostgreSQL 9.5 is scheduled EOL during the 21.05 life cycle and has been removed.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</section> </section>

3
nixos/modules/services/databases/postgresql.nix
View file

@ -295,8 +295,7 @@ in
# systems! # systems!
mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11 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 "17.09" then pkgs.postgresql_9_6
else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5 else throw "postgresql_9_5 was removed, please upgrade your postgresql version.");
else throw "postgresql_9_4 was removed, please upgrade your postgresql version.");
services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}"; services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}";

9
pkgs/servers/sql/postgresql/default.nix
View file

@ -191,15 +191,6 @@ let
in self: { in self: {
postgresql_9_5 = self.callPackage generic {
version = "9.5.25";
psqlSchema = "9.5";
sha256 = "00yny0sskxrqk4ji2phgv3iqxd1aiy6rh660k73s4s1pn9gcaa3n";
this = self.postgresql_9_5;
thisAttr = "postgresql_9_5";
inherit self;
};
postgresql_9_6 = self.callPackage generic { postgresql_9_6 = self.callPackage generic {
version = "9.6.21"; version = "9.6.21";
psqlSchema = "9.6"; psqlSchema = "9.6";

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

@ -553,7 +553,6 @@ mapAliases ({
pmtools = acpica-tools; # added 2018-11-01 pmtools = acpica-tools; # added 2018-11-01
polarssl = mbedtls; # added 2018-04-25 polarssl = mbedtls; # added 2018-04-25
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
postgresql95 = postgresql_9_5;
postgresql96 = postgresql_9_6; postgresql96 = postgresql_9_6;
postgresql100 = throw "postgresql100 was deprecated on 2018-10-21: use postgresql_10 instead"; postgresql100 = throw "postgresql100 was deprecated on 2018-10-21: use postgresql_10 instead";
# postgresql plugins # postgresql plugins

1
pkgs/top-level/all-packages.nix
View file

@ -18968,7 +18968,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_5
postgresql_9_6 postgresql_9_6
postgresql_10 postgresql_10
postgresql_11 postgresql_11