about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2021-12-06 21:57:05 +0100
committerGitHub <noreply@github.com>2021-12-06 21:57:05 +0100
commitc959de5b300aa9a31b5692f32866fe759ef9a453 (patch)
tree1a26259e78febdabaa59cdb41f3f93cb61254298 /pkgs
parent03bdc49d37a49dc44371fa7ccdfb23bbd3890c75 (diff)
parent757dd008b2f2926fc0f7688fa8189f930ea47521 (diff)
Merge pull request #148360 from helsinki-systems/drop/pg96
postgresql_9_6: drop
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/sql/postgresql/default.nix9
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix1
3 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 5b0190b93ac50..0af47ccca83a9 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -201,15 +201,6 @@ let
 
 in self: {
 
-  postgresql_9_6 = self.callPackage generic {
-    version = "9.6.24";
-    psqlSchema = "9.6";
-    sha256 = "sha256-rrehlr4+vtGnR271ZfOXIhh8EI3UfadIm+nE/K6YKs4=";
-    this = self.postgresql_9_6;
-    thisAttr = "postgresql_9_6";
-    inherit self;
-  };
-
   postgresql_10 = self.callPackage generic {
     version = "10.19";
     psqlSchema = "10.0"; # should be 10, but changing it is invasive
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cd800708ba302..cf33d0c52f2c1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -721,6 +721,7 @@ mapAliases ({
   polarssl = mbedtls; # added 2018-04-25
   poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
   postgresql96 = postgresql_9_6;
+  postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # added 2021-12-03
   # postgresql plugins
   pgjwt = postgresqlPackages.pgjwt;
   pg_repack = postgresqlPackages.pg_repack;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7655339b58134..82d6b32b949e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21359,7 +21359,6 @@ with pkgs;
   timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };
 
   inherit (import ../servers/sql/postgresql pkgs)
-    postgresql_9_6
     postgresql_10
     postgresql_11
     postgresql_12