diff --git a/ci/OWNERS b/ci/OWNERS index 1a1175cacd6c..dcc213eff007 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 diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 5752f9535f80..019255e59355 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -54,24 +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="; - cargoHash = "sha256-qTb3JV3u42EilaK2jP9oa5D09mkuHyRbGGRs9Rg4TzI="; - }; - - 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/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; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4bd8afa3cfd..ece00bdbe358 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6980,13 +6980,10 @@ 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 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;