nur-packages

commit ac45ef624021b0ec448e14a0d0fb01e4973a2125
parent 2a0f124be4ceb8d167c339e379c1bcd4afc934f7
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Sun, 22 May 2022 18:18:06 +0300

morecantile: unbroke on darwin

Diffstat:
M
pkgs/default.nix
 | 
2
+-
D
pkgs/development/python-modules/morecantile/default.nix
 | 
28
----------------------------
A
pkgs/geospatial/morecantile/default.nix
 | 
27
+++++++++++++++++++++++++++

3 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -85,7 +85,6 @@ lib.makeScope newScope (
     gpxelevations = callPackage ./development/python-modules/gpxelevations { };
     jsonseq = callPackage ./development/python-modules/jsonseq { };
     lru-dict = callPackage ./development/python-modules/lru-dict { };
-    morecantile = callPackage ./development/python-modules/morecantile { };
     portolan = callPackage ./development/python-modules/portolan { };
     pymbtiles = callPackage ./development/python-modules/pymbtiles { };
     s2sphere = callPackage ./development/python-modules/s2sphere { };
@@ -178,6 +177,7 @@ lib.makeScope newScope (
     };
     mbtiles2osmand = callPackage ./geospatial/mbtiles2osmand { };
     mbutiles = callPackage ./geospatial/mbutiles { };
+    morecantile = callPackage ./geospatial/morecantile { };
     orbisgis-bin = callPackage ./geospatial/orbisgis/bin.nix { jre = pkgs.jre8; };
     pmtiles = callPackage ./geospatial/pmtiles { };
     polyvectorization = libsForQt5.callPackage ./geospatial/polyvectorization { };
diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix
@@ -1,28 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
-
-python3Packages.buildPythonPackage rec {
-  pname = "morecantile";
-  version = "3.1.2";
-  disabled = python3Packages.pythonOlder "3.6";
-
-  src = fetchFromGitHub {
-    owner = "developmentseed";
-    repo = pname;
-    rev = version;
-    hash = "sha256-QvqXpcjunRWzfdcoyt3pUulDd20Ga8Cs9NTeLnUf5c8=";
-  };
-
-  propagatedBuildInputs = with python3Packages; [ pydantic pyproj ];
-
-  checkInputs = with python3Packages; [ mercantile pytestCheckHook ];
-
-  installCheckPhase = "$out/bin/morecantile --version";
-
-  meta = with lib; {
-    description = "Construct and use map tile grids in different projection";
-    homepage = "https://developmentseed.org/morecantile/";
-    license = licenses.mit;
-    maintainers = [ maintainers.sikmir ];
-    broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/161740
-  };
-}
diff --git a/pkgs/geospatial/morecantile/default.nix b/pkgs/geospatial/morecantile/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+  pname = "morecantile";
+  version = "3.1.2";
+  disabled = python3Packages.pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "developmentseed";
+    repo = pname;
+    rev = version;
+    hash = "sha256-QvqXpcjunRWzfdcoyt3pUulDd20Ga8Cs9NTeLnUf5c8=";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ pydantic pyproj ];
+
+  checkInputs = with python3Packages; [ mercantile pytestCheckHook ];
+
+  installCheckPhase = "$out/bin/morecantile --version";
+
+  meta = with lib; {
+    description = "Construct and use map tile grids in different projection";
+    homepage = "https://developmentseed.org/morecantile/";
+    license = licenses.mit;
+    maintainers = [ maintainers.sikmir ];
+  };
+}