From 31b9d15443de70e17e6cdd31b9b268c3bf7b77e4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 20 Nov 2024 22:17:24 +0100 Subject: [PATCH 1/6] postgresqlPackages.postgis: remove wolfgangwalther from maintainers I am now notified as member of the NixOS/postgres team about changes. --- pkgs/servers/sql/postgresql/ext/postgis.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index cca196dab006..673ddf4b9eac 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -149,13 +149,7 @@ buildPostgresqlExtension (finalAttrs: { homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${finalAttrs.version}/NEWS"; license = licenses.gpl2Plus; - maintainers = - with maintainers; - teams.geospatial.members - ++ [ - marcweber - wolfgangwalther - ]; + maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ]; inherit (postgresql.meta) platforms; }; }) From 1596e0aa7dcfefa869eba720d3137154c29d97ed Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 20 Nov 2024 22:14:50 +0100 Subject: [PATCH 2/6] OWNERS: add postgres team to own cargo-pgrx This is exclusively used to built PostgreSQL extensions. --- ci/OWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/OWNERS b/ci/OWNERS index 9795b76eef46..8e0f5baeb993 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -241,6 +241,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # PostgreSQL and related stuff /pkgs/servers/sql/postgresql @NixOS/postgres +/pkgs/development/tools/rust/cargo-pgrx @NixOS/postgres /nixos/modules/services/databases/postgresql.md @NixOS/postgres /nixos/modules/services/databases/postgresql.nix @NixOS/postgres /nixos/tests/postgresql @NixOS/postgres From 9e81eb8444f62085e30f2ed5cad453b215b1c4ed Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 20 Nov 2024 22:22:18 +0100 Subject: [PATCH 3/6] cargo-pgrx: 0.11.2 -> 0.12.6 Just move the top-level attribute to the latest stable version currently available in nixpkgs. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ce2bde8f8cd..285353983ce2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7009,7 +7009,7 @@ with pkgs; cargo-pgrx_0_12_0_alpha_1 cargo-pgrx_0_12_6 ; - cargo-pgrx = cargo-pgrx_0_11_2; + cargo-pgrx = cargo-pgrx_0_12_6; buildPgrxExtension = callPackage ../development/tools/rust/cargo-pgrx/buildPgrxExtension.nix { inherit (darwin.apple_sdk.frameworks) Security; From c8de5e8d85b10b19fa2cc1c08ebef979ff70ff8c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 20 Nov 2024 22:22:54 +0100 Subject: [PATCH 4/6] cargo-pgrx_0_10_2: remove Unused in nixpkgs. --- pkgs/development/tools/rust/cargo-pgrx/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 7 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 5752f9535f80..65d80ccc5396 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -54,12 +54,6 @@ let }; in { - cargo-pgrx_0_10_2 = generic { - version = "0.10.2"; - hash = "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls="; - cargoHash = "sha256-syZ3cQq8qDHBLvqmNDGoxeK6zXHJ47Jwkw3uhaXNCzI="; - }; - cargo-pgrx_0_11_2 = generic { version = "0.11.2"; hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 285353983ce2..1aaf3fbf984e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7003,7 +7003,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration; }; inherit (callPackages ../development/tools/rust/cargo-pgrx { }) - cargo-pgrx_0_10_2 cargo-pgrx_0_11_2 cargo-pgrx_0_11_3 cargo-pgrx_0_12_0_alpha_1 From 7faa64b0aa79fa16de9a983a0906de89ae0da097 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 20 Nov 2024 22:23:19 +0100 Subject: [PATCH 5/6] cargo-pgrx_0_11_2: remove Unused in nixpkgs. --- pkgs/development/tools/rust/cargo-pgrx/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 7 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 65d80ccc5396..b5a741cbf420 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -54,12 +54,6 @@ let }; in { - cargo-pgrx_0_11_2 = generic { - version = "0.11.2"; - hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM="; - cargoHash = "sha256-qTb3JV3u42EilaK2jP9oa5D09mkuHyRbGGRs9Rg4TzI="; - }; - cargo-pgrx_0_11_3 = generic { version = "0.11.3"; hash = "sha256-UHIfwOdXoJvR4Svha6ud0FxahP1wPwUtviUwUnTmLXU="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1aaf3fbf984e..843cf961573f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7003,7 +7003,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration; }; inherit (callPackages ../development/tools/rust/cargo-pgrx { }) - cargo-pgrx_0_11_2 cargo-pgrx_0_11_3 cargo-pgrx_0_12_0_alpha_1 cargo-pgrx_0_12_6 From 3903e1897ab692d3d63f9bd33916a63d7e40935d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 20 Nov 2024 22:24:57 +0100 Subject: [PATCH 6/6] cargo-pgrx_0_11_3: remove Unused in nixpkgs. --- pkgs/development/tools/rust/cargo-pgrx/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 7 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index b5a741cbf420..019255e59355 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -54,12 +54,6 @@ let }; in { - cargo-pgrx_0_11_3 = generic { - version = "0.11.3"; - hash = "sha256-UHIfwOdXoJvR4Svha6ud0FxahP1wPwUtviUwUnTmLXU="; - cargoHash = "sha256-j4HnD8Zt9uhlV5N7ldIy9564o9qFEqs5KfXHmnQ1WEw="; - }; - cargo-pgrx_0_12_0_alpha_1 = generic { version = "0.12.0-alpha.1"; hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 843cf961573f..3691a618fa33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7003,7 +7003,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration; }; inherit (callPackages ../development/tools/rust/cargo-pgrx { }) - cargo-pgrx_0_11_3 cargo-pgrx_0_12_0_alpha_1 cargo-pgrx_0_12_6 ;