From 156f69bbcb280c059a6418de7fd0921fab64ea1b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 31 Mar 2024 19:32:05 +0200 Subject: [PATCH 1/3] postgresqlPackages.pg_safeupdate: add myself as maintainer --- pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index 4c601896b45b..bbbff37da62b 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/eradman/pg-safeupdate"; changelog = "https://github.com/eradman/pg-safeupdate/raw/${src.rev}/NEWS"; platforms = postgresql.meta.platforms; + maintainers = with maintainers; [ wolfgangwalther ]; license = licenses.postgresql; broken = versionOlder postgresql.version "14"; }; From 7a358ffd0ec3e867fa118bdeb01bf45f2131082b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 31 Mar 2024 19:32:16 +0200 Subject: [PATCH 2/3] postgresqlPackages.postgis: add myself as maintainer --- pkgs/servers/sql/postgresql/ext/postgis.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 523bd154f6e5..6569439e351e 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"; license = licenses.gpl2; - maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ]; + maintainers = with maintainers; teams.geospatial.members ++ [ marcweber wolfgangwalther ]; inherit (postgresql.meta) platforms; }; } From 5e0eeb362bcfa4017e6e57b091c95a0dcb8ba571 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 26 Mar 2024 10:33:21 +0100 Subject: [PATCH 3/3] postgresql{12,13}Packages.pg_safeupdate: 1.5 -> 1.4 pg_safeupdate was updated to 1.5 in #269755. v1.5 is not compatible with PostgreSQL 12 and 13 anymore, so those were marked as broken. However, this blocks anyone using PostgreSQL 12 or 13 with pg_safeupdate from updating nixpkgs. Instead, the old version should have been kept for PG 12 and 13. --- .../sql/postgresql/ext/pg_safeupdate.nix | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index bbbff37da62b..c2213d9b6ca3 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -1,8 +1,31 @@ { lib, stdenv, fetchFromGitHub, postgresql }: +with { + "12" = { + version = "1.4"; + sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; + }; + "13" = { + version = "1.4"; + sha256 = "sha256-1cyvVEC9MQGMr7Tg6EUbsVBrMc8ahdFS3+CmDkmAq4Y="; + }; + "14" = { + version = "1.5"; + sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + }; + "15" = { + version = "1.5"; + sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + }; + "16" = { + version = "1.5"; + sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + }; +}."${lib.versions.major postgresql.version}" or (throw "pg_safeupdate: version specification for pg ${postgresql.version} missing."); + stdenv.mkDerivation rec { pname = "pg-safeupdate"; - version = "1.5"; + inherit version; buildInputs = [ postgresql ]; @@ -10,7 +33,7 @@ stdenv.mkDerivation rec { owner = "eradman"; repo = pname; rev = version; - sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs="; + inherit sha256; }; installPhase = '' @@ -24,6 +47,5 @@ stdenv.mkDerivation rec { platforms = postgresql.meta.platforms; maintainers = with maintainers; [ wolfgangwalther ]; license = licenses.postgresql; - broken = versionOlder postgresql.version "14"; }; }