nur-packages

commit 8f757fe5c48dd96dcce36c0140e47c13be35886e
parent 1d21a2ebb97dfab032c2c308c8bc20defd26c37b
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Thu,  1 Jul 2021 03:15:59 +0300

Move mercantile to nixpkgs

Diffstat:
M
pkgs/default.nix
 | 
1
-
D
pkgs/development/python-modules/mercantile/default.nix
 | 
24
------------------------
M
pkgs/development/python-modules/morecantile/default.nix
 | 
2
+-
M
pkgs/tools/geo/supermercado/default.nix
 | 
2
+-
M
pkgs/tools/geo/tilesets-cli/default.nix
 | 
2
+-
M
pkgs/tools/geo/tpkutils/default.nix
 | 
2
+-

6 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -96,7 +96,6 @@ lib.makeScope newScope (
     gpxelevations = callPackage ./development/python-modules/gpxelevations { };
     jsonseq = callPackage ./development/python-modules/jsonseq { };
     lru-dict = callPackage ./development/python-modules/lru-dict { };
-    mercantile = callPackage ./development/python-modules/mercantile { };
     mikatools = callPackage ./development/python-modules/mikatools { };
     morecantile = callPackage ./development/python-modules/morecantile { };
     pymbtiles = callPackage ./development/python-modules/pymbtiles { };
diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix
@@ -1,24 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages }:
-
-python3Packages.buildPythonPackage rec {
-  pname = "mercantile";
-  version = "1.2.1";
-
-  src = fetchFromGitHub {
-    owner = "mapbox";
-    repo = pname;
-    rev = version;
-    hash = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w=";
-  };
-
-  propagatedBuildInputs = with python3Packages; [ click ];
-
-  checkInputs = with python3Packages; [ pytestCheckHook hypothesis ];
-
-  meta = with lib; {
-    description = "Spherical mercator tile and coordinate utilities";
-    homepage = "http://mercantile.readthedocs.io/en/latest/";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.sikmir ];
-  };
-}
diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3Packages, mercantile }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
   pname = "morecantile";
diff --git a/pkgs/tools/geo/supermercado/default.nix b/pkgs/tools/geo/supermercado/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3Packages, mercantile }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "supermercado";
diff --git a/pkgs/tools/geo/tilesets-cli/default.nix b/pkgs/tools/geo/tilesets-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3Packages, jsonseq, mercantile, supermercado }:
+{ lib, fetchFromGitHub, python3Packages, jsonseq, supermercado }:
 
 python3Packages.buildPythonApplication rec {
   pname = "tilesets-cli";
diff --git a/pkgs/tools/geo/tpkutils/default.nix b/pkgs/tools/geo/tpkutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, python3Packages, mercantile, pymbtiles }:
+{ lib, fetchFromGitHub, python3Packages, pymbtiles }:
 
 python3Packages.buildPythonApplication rec {
   pname = "tpkutils";