Merge pull request #119389 from marsam/drop-postgresql_9_5
postgresql_9_5: drop
commit08546595671398eb7939eb5865d111351c546cf1
authorJörg Thalheim <Mic92@users.noreply.github.com>
dateFri 16 Apr 2021, 19:29 (6 years ago)
parenta09a59472ab382
nixos/doc/manual/release-notes/rl-2105.xml+5
@@ -955,6 +955,11 @@ environment.systemPackages = [
955955 <link linkend="opt-boot.extraSystemdUnitPaths">boot.extraSystemdUnitPaths</link> list.
956956 </para>
957957 </listitem>
958+ <listitem>
959+ <para>
960+ PostgreSQL 9.5 is scheduled EOL during the 21.05 life cycle and has been removed.
961+ </para>
962+ </listitem>
958963 </itemizedlist>
959964 </section>
960965</section>
nixos/modules/services/databases/postgresql.nix+1−2
@@ -295,8 +295,7 @@ in
295295 # systems!
296296 mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11
297297 else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
298− else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5
299− else throw "postgresql_9_4 was removed, please upgrade your postgresql version.");
298+ else throw "postgresql_9_5 was removed, please upgrade your postgresql version.");
300299
301300 services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}";
302301
pkgs/servers/sql/postgresql/default.nix−9
@@ -191,15 +191,6 @@ let
191191
192192in self: {
193193
194− postgresql_9_5 = self.callPackage generic {
195− version = "9.5.25";
196− psqlSchema = "9.5";
197− sha256 = "00yny0sskxrqk4ji2phgv3iqxd1aiy6rh660k73s4s1pn9gcaa3n";
198− this = self.postgresql_9_5;
199− thisAttr = "postgresql_9_5";
200− inherit self;
201− };
202−
203194 postgresql_9_6 = self.callPackage generic {
204195 version = "9.6.21";
205196 psqlSchema = "9.6";
pkgs/top-level/aliases.nix−1
@@ -553,7 +553,6 @@ mapAliases ({
553553 pmtools = acpica-tools; # added 2018-11-01
554554 polarssl = mbedtls; # added 2018-04-25
555555 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
556− postgresql95 = postgresql_9_5;
557556 postgresql96 = postgresql_9_6;
558557 postgresql100 = throw "postgresql100 was deprecated on 2018-10-21: use postgresql_10 instead";
559558 # postgresql plugins
pkgs/top-level/all-packages.nix−1
@@ -18968,7 +18968,6 @@ in
1896818968 timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };
1896918969
1897018970 inherit (import ../servers/sql/postgresql pkgs)
18971− postgresql_9_5
1897218971 postgresql_9_6
1897318972 postgresql_10
1897418973 postgresql_11