nur-packages

commit 363d3c202dd1e5dc8742c7abc96b9b37dcbec926
parent 116c9c8da86abec71b046efd2cc6ba8ee76cca49
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Mon, 27 Sep 2021 07:41:51 +0300

Up

Diffstat:
M
flake.lock
 | 
6
+++---
M
pkgs/data/maps/maptourist/default.nix
 | 
4
++--
M
pkgs/development/python-modules/morecantile/default.nix
 | 
7
++++---
M
pkgs/misc/gef/default.nix
 | 
4
++--
M
pkgs/osm/map-machine/default.nix
 | 
7
++++---

5 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1631786778,
-        "narHash": "sha256-CCMDj/0yXJnrlO4/NpHKhYRifNADQ1WUeQmFUD4sU4c=",
+        "lastModified": 1632383286,
+        "narHash": "sha256-WF49nWAN8saKDjXvXTiIIJRPDHgTkTYgTUMabnN+tRc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a39ee95a86b1fbdfa9edd65f3810b23d82457241",
+        "rev": "a3a23d9599b0a82e333ad91db2cdc479313ce154",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "maptourist";
-  version = "2021-09-20";
+  version = "2021-09-26";
 
   src = fetchurl {
     url = "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_${version}.zip";
-    hash = "sha256-jxQOkdQb94p4SBRMpkESIrRi0uhXenePmzpfgSkDrtg=";
+    hash = "sha256-NpP65DZmOJUP/dcV3QyFP+nFgwQyK+6iaCByC0YSeSo=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix
@@ -2,16 +2,17 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "morecantile";
-  version = "2.1.1";
+  version = "3.0.0";
+  disabled = python3Packages.pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "developmentseed";
     repo = pname;
     rev = version;
-    hash = "sha256-JX8wwR1I7+6qQq4OBJakQZx/uVkyJeaTjDZPWZeD+7I=";
+    hash = "sha256-k4EfOYXXyOmcWs6pi/7Muk8X1ncIyoo6R1LWfuobpWQ=";
   };
 
-  propagatedBuildInputs = with python3Packages; [ pydantic rasterio ];
+  propagatedBuildInputs = with python3Packages; [ pydantic pyproj ];
 
   checkInputs = with python3Packages; [ mercantile pytestCheckHook ];
 
diff --git a/pkgs/misc/gef/default.nix b/pkgs/misc/gef/default.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gef";
-  version = "2021.04";
+  version = "2021.07";
 
   src = fetchFromGitHub {
     owner = "hugsy";
     repo = pname;
     rev = version;
-    hash = "sha256-nxwVaUFtFlDFWCUpXPh4FOuqMJ+COsOZv9IyKZ6dvg8=";
+    hash = "sha256-zKn3yS9h8bzjsb/iPgNU8g5IgXFBaKvM7osTqzzv16s=";
   };
 
   dontBuild = true;
diff --git a/pkgs/osm/map-machine/default.nix b/pkgs/osm/map-machine/default.nix
@@ -2,14 +2,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "map-machine";
-  version = "2021-09-14";
+  version = "2021-09-26";
   disabled = python3Packages.pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "enzet";
     repo = pname;
-    rev = "cc9826ae578b62bbe864c8e24f6931ad28fdac44";
-    hash = "sha256-qFM+LNtRL6QCXQ6kiJuSAMfxu5Np8hM3YTKeayoE20g=";
+    rev = "4644d381665bdc1f2ea12bd6d9a70134c6ed9928";
+    hash = "sha256-DZnbFBZpJWPjilA0wSDS/q7aqHG0Hd9EUWBNMaSZLtI=";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -20,6 +20,7 @@ python3Packages.buildPythonApplication rec {
     portolan
     pycairo
     pyyaml
+    shapely
     svgwrite
     urllib3
   ];