lol

Merge pull request #167047 from helsinki-systems/drop/postgresql10

postgresql: remove 10.x

authored by

Mario Rodas and committed by
GitHub
405db077 7a2dd2ec

+10 -22
+1 -1
nixos/doc/manual/administration/declarative-containers.section.md
··· 9 9 { config = 10 10 { config, pkgs, ... }: 11 11 { services.postgresql.enable = true; 12 - services.postgresql.package = pkgs.postgresql_10; 12 + services.postgresql.package = pkgs.postgresql_14; 13 13 }; 14 14 }; 15 15 ```
+1 -1
nixos/doc/manual/configuration/config-file.section.md
··· 166 166 pkgs.emacs 167 167 ]; 168 168 169 - services.postgresql.package = pkgs.postgresql_10; 169 + services.postgresql.package = pkgs.postgresql_14; 170 170 ``` 171 171 172 172 The latter option definition changes the default PostgreSQL package
+1 -1
nixos/doc/manual/from_md/administration/declarative-containers.section.xml
··· 11 11 { config = 12 12 { config, pkgs, ... }: 13 13 { services.postgresql.enable = true; 14 - services.postgresql.package = pkgs.postgresql_10; 14 + services.postgresql.package = pkgs.postgresql_14; 15 15 }; 16 16 }; 17 17 </programlisting>
+1 -1
nixos/doc/manual/from_md/configuration/config-file.section.xml
··· 217 217 pkgs.emacs 218 218 ]; 219 219 220 - services.postgresql.package = pkgs.postgresql_10; 220 + services.postgresql.package = pkgs.postgresql_14; 221 221 </programlisting> 222 222 <para> 223 223 The latter option definition changes the default PostgreSQL
+1 -1
nixos/modules/virtualisation/nixos-containers.nix
··· 720 720 { config = 721 721 { config, pkgs, ... }: 722 722 { services.postgresql.enable = true; 723 - services.postgresql.package = pkgs.postgresql_10; 723 + services.postgresql.package = pkgs.postgresql_14; 724 724 725 725 system.stateVersion = "21.05"; 726 726 };
+4 -16
pkgs/servers/sql/postgresql/default.nix
··· 21 21 }: 22 22 let 23 23 atLeast = lib.versionAtLeast version; 24 - icuEnabled = atLeast "10"; 25 24 lz4Enabled = atLeast "14"; 26 25 27 26 in stdenv.mkDerivation rec { ··· 39 38 setOutputFlags = false; # $out retains configureFlags :-/ 40 39 41 40 buildInputs = 42 - [ zlib readline openssl libxml2 ] 43 - ++ lib.optionals icuEnabled [ icu ] 41 + [ zlib readline openssl libxml2 icu ] 44 42 ++ lib.optionals lz4Enabled [ lz4 ] 45 43 ++ lib.optionals enableSystemd [ systemd ] 46 44 ++ lib.optionals gssSupport [ libkrb5 ] 47 45 ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; 48 46 49 - nativeBuildInputs = [ makeWrapper ] ++ lib.optionals icuEnabled [ pkg-config ]; 47 + nativeBuildInputs = [ makeWrapper pkg-config ]; 50 48 51 49 enableParallelBuilding = !stdenv.isDarwin; 52 50 ··· 62 60 configureFlags = [ 63 61 "--with-openssl" 64 62 "--with-libxml" 63 + "--with-icu" 65 64 "--sysconfdir=/etc" 66 65 "--libdir=$(lib)/lib" 67 66 "--with-system-tzdata=${tzdata}/share/zoneinfo" 68 67 "--enable-debug" 69 68 (lib.optionalString enableSystemd "--with-systemd") 70 69 (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") 71 - ] ++ lib.optionals icuEnabled [ "--with-icu" ] 72 - ++ lib.optionals lz4Enabled [ "--with-lz4" ] 70 + ] ++ lib.optionals lz4Enabled [ "--with-lz4" ] 73 71 ++ lib.optionals gssSupport [ "--with-gssapi" ] 74 72 ++ lib.optionals stdenv.hostPlatform.isRiscV [ "--disable-spinlocks" ]; 75 73 ··· 199 197 }; 200 198 201 199 in self: { 202 - 203 - postgresql_10 = self.callPackage generic { 204 - version = "10.22"; 205 - psqlSchema = "10.0"; # should be 10, but changing it is invasive 206 - hash = "sha256-lVl3VVxp3xpk9EuB1KGYfrdKu9GHBXn1rZ2UYTPdjk0="; 207 - this = self.postgresql_10; 208 - thisAttr = "postgresql_10"; 209 - inherit self; 210 - icu = self.icu67; 211 - }; 212 200 213 201 postgresql_11 = self.callPackage generic { 214 202 version = "11.17";
+1
pkgs/top-level/aliases.nix
··· 918 918 # postgresql 919 919 postgresql96 = throw "'postgresql96' has been renamed to/replaced by 'postgresql_9_6'"; # Converted to throw 2022-09-24 920 920 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 921 + postgresql_10 = throw "postgresql_10 has been removed from nixpkgs, as this version went EOL on 2022-11-10"; # Added 2022-08-01 921 922 922 923 # postgresql plugins 923 924 cstore_fdw = throw "'cstore_fdw' has been renamed to/replaced by 'postgresqlPackages.cstore_fdw'"; # Converted to throw 2022-09-24
-1
pkgs/top-level/all-packages.nix
··· 23812 23812 timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; 23813 23813 23814 23814 inherit (import ../servers/sql/postgresql pkgs) 23815 - postgresql_10 23816 23815 postgresql_11 23817 23816 postgresql_12 23818 23817 postgresql_13