diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-13 19:10:53 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-13 19:10:53 +0200 |
| commit | f3a1652b098bbe33e5ab8a827ff3778b3c2120b8 (patch) | |
| tree | 243f5d1e82706ad3d727a26692bd1d53d9373776 /pkgs/servers/sql | |
| parent | 561b7b74f8e5783f29bb589482b3ed60ce2c1318 (diff) | |
| parent | c0c2f2903f310dd5efb86f02b4b5f824183f5173 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix | 29 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/ext/postgis.nix | 2 |
2 files changed, 27 insertions, 4 deletions
diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index 4c601896b45b1..c2213d9b6ca32 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 = '' @@ -22,7 +45,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"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 523bd154f6e57..6569439e351eb 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; }; } |