From 91a77ae1ad68555bf56899715d28c266d4372339 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sat, 27 Sep 2025 09:19:28 +0200 Subject: [PATCH 1/2] python3Packages.basemap-data-{,hires}: fix and add geospatial team --- .../development/python-modules/basemap-data-hires/default.nix | 3 ++- pkgs/development/python-modules/basemap-data/default.nix | 4 ++-- pkgs/development/python-modules/basemap/default.nix | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/basemap-data-hires/default.nix b/pkgs/development/python-modules/basemap-data-hires/default.nix index 44d352a8822a..cf96bf36f1d7 100644 --- a/pkgs/development/python-modules/basemap-data-hires/default.nix +++ b/pkgs/development/python-modules/basemap-data-hires/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pyproject = true; inherit (basemap) version src; - sourceRoot = "${src.name}/packages/basemap_data_hires"; + sourceRoot = "${src.name}/data/basemap_data_hires"; build-system = [ setuptools @@ -26,5 +26,6 @@ buildPythonPackage rec { description = "High-resolution data assets for matplotlib basemap"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ moraxyc ]; + teams = with lib.teams; [ geospatial ]; }; } diff --git a/pkgs/development/python-modules/basemap-data/default.nix b/pkgs/development/python-modules/basemap-data/default.nix index f50feac37d48..4d80345558ba 100644 --- a/pkgs/development/python-modules/basemap-data/default.nix +++ b/pkgs/development/python-modules/basemap-data/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { format = "setuptools"; inherit (basemap) version src; - sourceRoot = "${src.name}/packages/basemap_data"; + sourceRoot = "${src.name}/data/basemap_data"; # no tests doCheck = false; @@ -23,6 +23,6 @@ buildPythonPackage rec { mit lgpl3Plus ]; - maintainers = [ ]; + teams = [ teams.geospatial ]; }; } diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index 415b6addd73b..f344cd5eab94 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { coastlines, lakes, rivers and political boundaries. See http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do. ''; - maintainers = [ ]; + teams = [ teams.geospatial ]; license = with licenses; [ mit lgpl21 From 58ba29eb7990d9ba9454a7d6f051ab551489bbe5 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sat, 27 Sep 2025 09:27:54 +0200 Subject: [PATCH 2/2] python3Packages.basemap: fix build --- pkgs/development/python-modules/basemap/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index f344cd5eab94..8bafd07f952f 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-1T1FTcR99KbpqiYzrd2r5h1wTcygBEU7BLZXZ8uMthU="; }; - sourceRoot = "${src.name}/packages/basemap"; - nativeBuildInputs = [ cython geos @@ -65,7 +63,7 @@ buildPythonPackage rec { longDescription = '' An add-on toolkit for matplotlib that lets you plot data on map projections with coastlines, lakes, rivers and political boundaries. See - http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do. + https://matplotlib.org/basemap/stable/users/examples.html for examples of what it can do. ''; teams = [ teams.geospatial ]; license = with licenses; [