From daf490f1f9b5abd9ef9fe115e4d11a2b55a2ccbd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 19 Feb 2023 18:34:43 +0000 Subject: [PATCH] python310Packages.rtree: Normalize attribute and dirname --- pkgs/applications/science/electronics/flatcam/default.nix | 2 +- pkgs/development/python-modules/geopandas/default.nix | 4 ++-- pkgs/development/python-modules/osmnx/default.nix | 4 ++-- pkgs/development/python-modules/{Rtree => rtree}/default.nix | 0 pkgs/development/python-modules/spyder/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/development/python-modules/{Rtree => rtree}/default.nix (100%) diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index 1f6679625ec7..13fccd0e0fba 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { numpy packaging pyqt4 - Rtree + rtree scipy setuptools shapely diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 47d2376b41d6..d89997852738 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -8,7 +8,7 @@ , pyproj , pytestCheckHook , pythonOlder -, Rtree +, rtree , shapely }: @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - Rtree + rtree ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index 330385625d2e..fec12037e20b 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -11,7 +11,7 @@ , pythonOlder , rasterio , requests -, Rtree +, rtree , scikit-learn , scipy , shapely @@ -38,7 +38,7 @@ buildPythonPackage rec { numpy pandas requests - Rtree + rtree shapely folium scikit-learn diff --git a/pkgs/development/python-modules/Rtree/default.nix b/pkgs/development/python-modules/rtree/default.nix similarity index 100% rename from pkgs/development/python-modules/Rtree/default.nix rename to pkgs/development/python-modules/rtree/default.nix diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 80435a738d58..a209a488355e 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -35,7 +35,7 @@ , qtconsole , qtpy , rope -, Rtree +, rtree , scipy , spyder-kernels , textdistance @@ -93,7 +93,7 @@ buildPythonPackage rec { qtconsole qtpy rope - Rtree + rtree scipy spyder-kernels textdistance diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a97d011f9d3..ed7ae60dd9d8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10226,7 +10226,7 @@ self: super: with self; { rtoml = callPackage ../development/python-modules/rtoml { }; - Rtree = callPackage ../development/python-modules/Rtree { + rtree = callPackage ../development/python-modules/rtree { inherit (pkgs) libspatialindex; };