From 1a78867a15791b8b4df9f42b0991693f826cf507 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 7 Jul 2025 14:03:21 +0200 Subject: [PATCH 1/9] postgresql18Packages.{pg_hint_plan,pg_safeupdate,pgaudit}: mark broken No source specification for v18 available, yet, so they should be marked broken instead of throwing random errors and breaking the maintainer/update script. --- .../sql/postgresql/ext/pg_hint_plan.nix | 52 ++++++++------- .../sql/postgresql/ext/pg_safeupdate.nix | 63 ++++++++++--------- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 54 ++++++++-------- 3 files changed, 92 insertions(+), 77 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index c19c50de8a02..ac7c46041125 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -6,31 +6,34 @@ }: let + sources = { + "17" = { + version = "1.7.0"; + hash = "sha256-MNQMePDmGxC8OFIJuVJrhfgU566vkng00+tjeGpGKvs="; + }; + "16" = { + version = "1.6.0"; + hash = "sha256-lg7N0QblluTgtNo1tGZjirNJSyQXtcAEs9Jqd3zx0Sg="; + }; + "15" = { + version = "1.5.1"; + hash = "sha256-o8Hepf/Mc1ClRTLZ6PBdqU4jSdlz+ijVgl2vJKmIc6M="; + }; + "14" = { + version = "1.4.2"; + hash = "sha256-nGyKcNY57RdQdZKSaBPk2/YbT0Annz1ZevH0lKswdhA="; + }; + "13" = { + version = "1.3.9"; + hash = "sha256-KGcHDwk8CgNHPZARfLBfS8r7TRCP9LPjT+m4fNSnnW0="; + }; + }; + source = - { - "17" = { - version = "1.7.0"; - hash = "sha256-MNQMePDmGxC8OFIJuVJrhfgU566vkng00+tjeGpGKvs="; - }; - "16" = { - version = "1.6.0"; - hash = "sha256-lg7N0QblluTgtNo1tGZjirNJSyQXtcAEs9Jqd3zx0Sg="; - }; - "15" = { - version = "1.5.1"; - hash = "sha256-o8Hepf/Mc1ClRTLZ6PBdqU4jSdlz+ijVgl2vJKmIc6M="; - }; - "14" = { - version = "1.4.2"; - hash = "sha256-nGyKcNY57RdQdZKSaBPk2/YbT0Annz1ZevH0lKswdhA="; - }; - "13" = { - version = "1.3.9"; - hash = "sha256-KGcHDwk8CgNHPZARfLBfS8r7TRCP9LPjT+m4fNSnnW0="; - }; - } - .${lib.versions.major postgresql.version} - or (throw "Source for pg_hint_plan is not available for ${postgresql.version}"); + sources.${lib.versions.major postgresql.version} or { + version = ""; + hash = throw "Source for pg_hint_plan is not available for ${postgresql.version}"; + }; in postgresqlBuildExtension { pname = "pg_hint_plan"; @@ -53,6 +56,7 @@ postgresqlBuildExtension { enableUpdateScript = false; meta = { + broken = !builtins.elem (lib.versions.major postgresql.version) (builtins.attrNames sources); description = "Extension to tweak PostgreSQL execution plans using so-called 'hints' in SQL comments"; homepage = "https://github.com/ossc-db/pg_hint_plan"; maintainers = with lib.maintainers; [ _1000101 ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index 089db484dba5..cedcb3ffc6f4 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -5,46 +5,53 @@ postgresqlBuildExtension, }: -with { - "13" = { - version = "1.4"; - hash = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; +let + sources = { + "13" = { + version = "1.4"; + hash = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; + }; + "14" = { + version = "1.5"; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + }; + "15" = { + version = "1.5"; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + }; + "16" = { + version = "1.5"; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + }; + "17" = { + version = "1.5"; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + }; }; - "14" = { - version = "1.5"; - hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; - }; - "15" = { - version = "1.5"; - hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; - }; - "16" = { - version = "1.5"; - hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; - }; - "17" = { - version = "1.5"; - hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; - }; -} -."${lib.versions.major postgresql.version}" - or (throw "pg_safeupdate: version specification for pg ${postgresql.version} missing."); -postgresqlBuildExtension rec { + source = + sources."${lib.versions.major postgresql.version}" or { + version = ""; + hash = throw "pg_safeupdate: version specification for pg ${postgresql.version} missing."; + }; +in + +postgresqlBuildExtension { pname = "pg-safeupdate"; - inherit version; + inherit (source) version; src = fetchFromGitHub { owner = "eradman"; repo = "pg-safeupdate"; - tag = version; - inherit hash; + tag = source.version; + inherit (source) hash; }; meta = { + broken = !builtins.elem (lib.versions.major postgresql.version) (builtins.attrNames sources); description = "Simple extension to PostgreSQL that requires criteria for UPDATE and DELETE"; homepage = "https://github.com/eradman/pg-safeupdate"; - changelog = "https://github.com/eradman/pg-safeupdate/raw/${src.rev}/NEWS"; + changelog = "https://github.com/eradman/pg-safeupdate/raw/${source.version}/NEWS"; platforms = postgresql.meta.platforms; maintainers = with lib.maintainers; [ wolfgangwalther ]; license = lib.licenses.postgresql; diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 183285d0924a..afaa889a72f7 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -8,31 +8,34 @@ }: let + sources = { + "17" = { + version = "17.0"; + hash = "sha256-3ksq09wiudQPuBQI3dhEQi8IkXKLVIsPFgBnwLiicro="; + }; + "16" = { + version = "16.0"; + hash = "sha256-8+tGOl1U5y9Zgu+9O5UDDE4bec4B0JC/BQ6GLhHzQzc="; + }; + "15" = { + version = "1.7.0"; + hash = "sha256-8pShPr4HJaJQPjW1iPJIpj3CutTx8Tgr+rOqoXtgCcw="; + }; + "14" = { + version = "1.6.2"; + hash = "sha256-Bl7Jk2B0deZUDiI391vk4nilwuVGHd1wuaQRSCoA3Mk="; + }; + "13" = { + version = "1.5.2"; + hash = "sha256-fyf2Ym0fAAXjc28iFCGDEftPAyDLXmEgi/0DaTJJiIg="; + }; + }; + source = - { - "17" = { - version = "17.0"; - hash = "sha256-3ksq09wiudQPuBQI3dhEQi8IkXKLVIsPFgBnwLiicro="; - }; - "16" = { - version = "16.0"; - hash = "sha256-8+tGOl1U5y9Zgu+9O5UDDE4bec4B0JC/BQ6GLhHzQzc="; - }; - "15" = { - version = "1.7.0"; - hash = "sha256-8pShPr4HJaJQPjW1iPJIpj3CutTx8Tgr+rOqoXtgCcw="; - }; - "14" = { - version = "1.6.2"; - hash = "sha256-Bl7Jk2B0deZUDiI391vk4nilwuVGHd1wuaQRSCoA3Mk="; - }; - "13" = { - version = "1.5.2"; - hash = "sha256-fyf2Ym0fAAXjc28iFCGDEftPAyDLXmEgi/0DaTJJiIg="; - }; - } - .${lib.versions.major postgresql.version} - or (throw "Source for pgaudit is not available for ${postgresql.version}"); + sources.${lib.versions.major postgresql.version} or { + version = ""; + hash = throw "Source for pgaudit is not available for ${postgresql.version}"; + }; in postgresqlBuildExtension { pname = "pgaudit"; @@ -42,7 +45,7 @@ postgresqlBuildExtension { owner = "pgaudit"; repo = "pgaudit"; tag = source.version; - hash = source.hash; + inherit (source) hash; }; buildInputs = [ @@ -55,6 +58,7 @@ postgresqlBuildExtension { enableUpdateScript = false; meta = { + broken = !builtins.elem (lib.versions.major postgresql.version) (builtins.attrNames sources); description = "Open Source PostgreSQL Audit Logging"; homepage = "https://github.com/pgaudit/pgaudit"; changelog = "https://github.com/pgaudit/pgaudit/releases/tag/${source.version}"; From 59e77beb3b833acc3d8d5bc194dcfcb06ecfa4a1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 7 Jul 2025 14:05:29 +0200 Subject: [PATCH 2/9] postgresql18Packages.pg_safeupdate: unbreak --- pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index cedcb3ffc6f4..7b9249ad64b1 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -27,6 +27,10 @@ let version = "1.5"; hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; }; + "18" = { + version = "1.5"; + hash = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + }; }; source = From 53c381fdf368991575005a4cb39dcc17ae918454 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 7 Jul 2025 14:05:48 +0200 Subject: [PATCH 3/9] postgresql18Packages.pg_hint_plan: add note about upstream ticket --- pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index ac7c46041125..10b86ef58d97 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -7,6 +7,7 @@ let sources = { + # For v18, see https://github.com/ossc-db/pg_hint_plan/issues/224 "17" = { version = "1.7.0"; hash = "sha256-MNQMePDmGxC8OFIJuVJrhfgU566vkng00+tjeGpGKvs="; From 3ee9701f36529b763e611b4c1271dc912df69580 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 7 Jul 2025 14:08:18 +0200 Subject: [PATCH 4/9] postgresql18Packages.pgaudit: add note about v18 support --- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index afaa889a72f7..147c8e24a205 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -9,6 +9,7 @@ let sources = { + # v18: No upstream ticket, yet (2025-07-07) "17" = { version = "17.0"; hash = "sha256-3ksq09wiudQPuBQI3dhEQi8IkXKLVIsPFgBnwLiicro="; From 77a84b41094b3773193ac9c8b6b47b66fe03ca90 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 7 Jul 2025 14:09:56 +0200 Subject: [PATCH 5/9] postgresql17Packages.pgaudit: 17.0 -> 17.1 https://github.com/pgaudit/pgaudit/releases/tag/17.1 --- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 147c8e24a205..b1c65b4c618a 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -11,8 +11,8 @@ let sources = { # v18: No upstream ticket, yet (2025-07-07) "17" = { - version = "17.0"; - hash = "sha256-3ksq09wiudQPuBQI3dhEQi8IkXKLVIsPFgBnwLiicro="; + version = "17.1"; + hash = "sha256-9St/ESPiFq2NiPKqbwHLwkIyATKUkOGxFcUrWgT+Iqo="; }; "16" = { version = "16.0"; From 8e9aa8119ef990a3ccf97e3010f398d630add64d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 7 Jul 2025 14:23:36 +0200 Subject: [PATCH 6/9] postgresql16Packages.pgaudit: 16.0 -> 16.1 https://github.com/pgaudit/pgaudit/releases/tag/16.1 --- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index b1c65b4c618a..45d659173abe 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -15,8 +15,8 @@ let hash = "sha256-9St/ESPiFq2NiPKqbwHLwkIyATKUkOGxFcUrWgT+Iqo="; }; "16" = { - version = "16.0"; - hash = "sha256-8+tGOl1U5y9Zgu+9O5UDDE4bec4B0JC/BQ6GLhHzQzc="; + version = "16.1"; + hash = "sha256-fzoAcXEKmA+xD4HtcHZgcduh1XmSgL8ZS4R72og7RGQ="; }; "15" = { version = "1.7.0"; From 13bb575a82eb9d6e61c22d828a66eaa5b2b23cf4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 7 Jul 2025 14:24:04 +0200 Subject: [PATCH 7/9] postgresql15Packages.pgaudit: 1.7.0 -> 1.7.1 https://github.com/pgaudit/pgaudit/releases/tag/1.7.1 --- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 45d659173abe..0849c900874a 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -19,8 +19,8 @@ let hash = "sha256-fzoAcXEKmA+xD4HtcHZgcduh1XmSgL8ZS4R72og7RGQ="; }; "15" = { - version = "1.7.0"; - hash = "sha256-8pShPr4HJaJQPjW1iPJIpj3CutTx8Tgr+rOqoXtgCcw="; + version = "1.7.1"; + hash = "sha256-emwoTowT7WKFX0RQDqJXjIblrzqaUIUkzqSqBCHVKQ8="; }; "14" = { version = "1.6.2"; From f2d2e1a1bf077f21cb6580c032074e4bc2fbe284 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 7 Jul 2025 14:24:36 +0200 Subject: [PATCH 8/9] postgresql14Packages.pgaudit: 1.6.2 -> 1.6.3 https://github.com/pgaudit/pgaudit/releases/tag/1.6.3 --- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 0849c900874a..65a777d1de8d 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -23,8 +23,8 @@ let hash = "sha256-emwoTowT7WKFX0RQDqJXjIblrzqaUIUkzqSqBCHVKQ8="; }; "14" = { - version = "1.6.2"; - hash = "sha256-Bl7Jk2B0deZUDiI391vk4nilwuVGHd1wuaQRSCoA3Mk="; + version = "1.6.3"; + hash = "sha256-KgLidJHjUK9BTp6ffmGUj1chcwIe6IzlcadRpGCfNdM="; }; "13" = { version = "1.5.2"; From a160bd4bfb1ca62eed6264990b86fd871012a901 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 7 Jul 2025 14:25:03 +0200 Subject: [PATCH 9/9] postgresql13Packages.pgaudit: 1.5.2 -> 1.5.3 https://github.com/pgaudit/pgaudit/releases/tag/1.5.3 --- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 65a777d1de8d..454fe1200ac5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -27,8 +27,8 @@ let hash = "sha256-KgLidJHjUK9BTp6ffmGUj1chcwIe6IzlcadRpGCfNdM="; }; "13" = { - version = "1.5.2"; - hash = "sha256-fyf2Ym0fAAXjc28iFCGDEftPAyDLXmEgi/0DaTJJiIg="; + version = "1.5.3"; + hash = "sha256-IU4Clec3DkKWT7+kw0VtQNybt94i7M2rSSgJG/XdcRs="; }; };