diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-31 06:00:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-31 06:00:58 +0000 |
commit | 97868dae8e43d4d915e232649acf575bad87e0f6 (patch) | |
tree | 76d0d720c57c069f3ea70300a9812001cd2f50c4 /pkgs/servers/sql | |
parent | 135430eb607cd5775d31287c4c233dc78cdd52e0 (diff) | |
parent | 04ba740f89b23001077df136c216a885371533ad (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 11 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/age.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pgaudit.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pipelinedb.nix | 39 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/packages.nix | 2 |
6 files changed, 0 insertions, 61 deletions
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 448715171e419..fcdf18a420345 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -374,17 +374,6 @@ let }; mkPackages = self: { - # TODO: remove ahead of 23.11 branchoff - # "PostgreSQL 11 will stop receiving fixes on November 9, 2023" - postgresql_11 = self.callPackage generic { - version = "11.21"; - psqlSchema = "11.1"; # should be 11, but changing it is invasive - hash = "sha256-B7CDdHHV3XeyUWazRxjzuhCBa2rWHmkeb8VHzz/P+FA="; - this = self.postgresql_11; - thisAttr = "postgresql_11"; - inherit self; - }; - postgresql_12 = self.callPackage generic { version = "12.16"; psqlSchema = "12"; diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index c0de0c30d5a7b..3a1c1c8388bee 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -6,7 +6,6 @@ let "14" = "sha256-w93Q499sZRk4q85A9yqKQjGUd9Pl8UL8K1D3W7mHRTU="; "13" = "sha256-Sot7FR0oW7kWA680pNCMCmlflu4RfJTSWZn9mrXrpzw="; "12" = "sha256-XezcXoHHLCD1/2OHmKhxome2pdjOsYAfZlpvOoU3aS4="; - "11" = "sha256-ZkNAIMO69BxF3knQ+jcUBVuDgcoZXZccF5O+acpZ81M="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index d0cf1193fb56d..afc5b9fe65065 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -22,10 +22,6 @@ let version = "1.3.9"; hash = "sha256-64/dlm6e4flCxMQ8efsxfKSlja+Tko0zsghTgLatN+Y="; }; - "11" = { - version = "1.3.9"; - hash = "sha256-8t/HhB/2Kjx4xMItmmKv3g9gba5VCBHdplYtYD/3UhA="; - }; }.${lib.versions.major postgresql.version} or (throw "Source for pg_hint_plan is not available for ${postgresql.version}"); in stdenv.mkDerivation { diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 188451f1b8849..f4c03d611f503 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -22,10 +22,6 @@ let version = "1.4.3"; hash = "sha256-c8/xUFIHalu2bMCs57DeylK0oW0VnQwmUCpdp+tYqk4="; }; - "11" = { - version = "1.3.4"; - hash = "sha256-UEnwD36ejeYWyKRHZ4mPt6/Ru76Gy8s/rgIvmgermiM="; - }; }.${lib.versions.major postgresql.version} or (throw "Source for pgaudit is not available for ${postgresql.version}"); in stdenv.mkDerivation { diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix deleted file mode 100644 index 6403138fd7047..0000000000000 --- a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, zeromq, openssl, libsodium, libkrb5 }: - -stdenv.mkDerivation rec { - pname = "pipelinedb"; - version = "1.0.0-13"; - - src = fetchFromGitHub { - owner = "pipelinedb"; - repo = pname; - rev = version; - sha256 = "1mnqpvx6g1r2n4kjrrx01vbdx7kvndfsbmm7zbzizjnjlyixz75f"; - }; - - buildInputs = [ postgresql openssl zeromq libsodium libkrb5 ]; - - makeFlags = [ "USE_PGXS=1" ]; - - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lsodium"; - - preConfigure = '' - substituteInPlace Makefile \ - --replace "/usr/lib/libzmq.a" "${zeromq}/lib/libzmq.a" - ''; - - installPhase = '' - mkdir -p $out/bin - install -D -t $out/lib/ pipelinedb.so - install -D -t $out/share/postgresql/extension {pipelinedb-*.sql,pipelinedb.control} - ''; - - meta = with lib; { - description = "High-performance time-series aggregation for PostgreSQL"; - homepage = "https://www.pipelinedb.com/"; - license = licenses.asl20; - platforms = postgresql.meta.platforms; - maintainers = [ maintainers.marsam ]; - broken = versions.major postgresql.version != "11"; - }; -} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index d9d9ce8b09d98..09cba4ea81aa8 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -56,8 +56,6 @@ self: super: { pgtap = super.callPackage ./ext/pgtap.nix { }; - pipelinedb = super.callPackage ./ext/pipelinedb.nix { }; - smlar = super.callPackage ./ext/smlar.nix { }; temporal_tables = super.callPackage ./ext/temporal_tables.nix { }; |