BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

postgresql_9_6: drop

Browse source
This commit is contained in:
ajs124 2021-12-03 01:00:48 +01:00
parent 571cbf3d1d
commit 757dd008b2
7 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/doc/manual/administration/declarative-containers.section.md
View file

@ -9,7 +9,7 @@ containers.database =
{ config = { config =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ services.postgresql.enable = true; { services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql_9_6; services.postgresql.package = pkgs.postgresql_10;
}; };
}; };
``` ```

2
nixos/doc/manual/from_md/administration/declarative-containers.section.xml
View file

@ -11,7 +11,7 @@ containers.database =
{ config = { config =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ services.postgresql.enable = true; { services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql_9_6; services.postgresql.package = pkgs.postgresql_10;
}; };
}; };
</programlisting> </programlisting>

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

@ -289,14 +289,16 @@ in
port = cfg.port; port = cfg.port;
}; };
services.postgresql.package = services.postgresql.package = let
mkThrow = ver: throw "postgresql_${ver} was removed, please upgrade your postgresql version.";
in
# Note: when changing the default, make it conditional on # Note: when changing the default, make it conditional on
# ‘system.stateVersion’ to maintain compatibility with existing # ‘system.stateVersion’ to maintain compatibility with existing
# systems! # systems!
mkDefault (if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13 mkDefault (if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13
else if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11 else 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 mkThrow "9_6"
else throw "postgresql_9_5 was removed, please upgrade your postgresql version."); else mkThrow "9_5");
services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}"; services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}";

4
nixos/modules/virtualisation/nixos-containers.nix
View file

@ -716,9 +716,9 @@ in
{ config = { config =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ services.postgresql.enable = true; { services.postgresql.enable = true;
services.postgresql.package = pkgs.postgresql_9_6; services.postgresql.package = pkgs.postgresql_10;
system.stateVersion = "17.03"; system.stateVersion = "21.05";
}; };
}; };
} }

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

@ -200,15 +200,6 @@ let
in self: { 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 { postgresql_10 = self.callPackage generic {
version = "10.19"; version = "10.19";
psqlSchema = "10.0"; # should be 10, but changing it is invasive psqlSchema = "10.0"; # should be 10, but changing it is invasive

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

@ -718,6 +718,7 @@ mapAliases ({
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
postgresql96 = postgresql_9_6; 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 # postgresql plugins
pgjwt = postgresqlPackages.pgjwt; pgjwt = postgresqlPackages.pgjwt;
pg_repack = postgresqlPackages.pg_repack; pg_repack = postgresqlPackages.pg_repack;

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

@ -21398,7 +21398,6 @@ with pkgs;
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_6
postgresql_10 postgresql_10
postgresql_11 postgresql_11
postgresql_12 postgresql_12