nur-packages

commit 716cfd5d7f3223f18d8c9e92938eeb1f134b0764
parent 49270bae6aa0d39d56e0ab7403d64596e3e9291a
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Fri, 15 Nov 2024 02:14:41 +0400

Up

Diffstat:
M
pkgs/data/maps/opentopomap/default.nix
 | 
22
+++++++++++++---------
M
pkgs/geospatial/tilecloud/default.nix
 | 
3
+++
M
pkgs/misc/shifu/default.nix
 | 
6
+++---

3 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/pkgs/data/maps/opentopomap/default.nix b/pkgs/data/maps/opentopomap/default.nix
@@ -6,21 +6,25 @@
   unzip,
   mkgmap,
   mkgmap-splitter,
-  osm-extracts,
 }:
 let
+  version = "241113";
   bounds = fetchurl {
-    url = "https://www.thkukuk.de/osm/data/bounds-20240126.zip";
-    hash = "sha256-N3QHgWKmbTu6yz9ojKlfwZm46UGeTmtkI2yuB6C7n80=";
+    url = "https://www.thkukuk.de/osm/data/bounds-20241025.zip";
+    hash = "sha256-7VjO9EYVQ0IEmjR3SXxaTAT22zToHw9JPOVm0p5rF3M=";
   };
   sea = fetchurl {
-    url = "https://www.thkukuk.de/osm/data/sea-20240126001517.zip";
-    hash = "sha256-YGtlp3K03PDFi3dfWG9bnv3qEWQOmx96eOFm1FU4AJw=";
+    url = "https://www.thkukuk.de/osm/data/sea-20241114001517.zip";
+    hash = "sha256-nWxxPtaqrNLz2UiiQhpfo2lEbIjcsOl5IPuYWWCASXs=";
+  };
+  armenia = fetchurl {
+    url = "https://download.geofabrik.de/asia/armenia-${version}.osm.pbf";
+    hash = "sha256-/4jxZy0ceiqyOaCDC0eA/sO44A1M+STeBHdSXDkRCJg=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "opentopomap";
-  inherit (osm-extracts) version;
+  pname = "otm-armenia";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "der-stefan";
@@ -44,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   buildPhase = ''
-    (cd data && splitter --precomp-sea=../sea --output=o5m ${osm-extracts.src})
+    (cd data && splitter --precomp-sea=../sea --output=o5m ${armenia})
     (cd style/typ && mkgmap --family-id=35 opentopomap.txt)
 
     mkgmap \
@@ -58,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   installPhase = ''
-    install -Dm644 output/gmapsupp.img $out/otm-russia-nwfd.img
+    install -Dm644 output/gmapsupp.img $out/otm-armenia.img
   '';
 
   meta = {
diff --git a/pkgs/geospatial/tilecloud/default.nix b/pkgs/geospatial/tilecloud/default.nix
@@ -18,7 +18,10 @@ python3Packages.buildPythonApplication rec {
   };
 
   pythonRelaxDeps = [
+    "bottle"
+    "certifi"
     "pillow"
+    "pyproj"
     "webob"
   ];
 
diff --git a/pkgs/misc/shifu/default.nix b/pkgs/misc/shifu/default.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "shifu";
-  version = "0.52.0";
+  version = "0.57.0";
 
   src = fetchFromGitHub {
     owner = "Edgenesis";
     repo = "shifu";
     rev = "v${version}";
-    hash = "sha256-YAw4guowbleFWMtHYuAi03w0/SlHnbD0vqHjgmPbJro=";
+    hash = "sha256-RRK8N/CLNWf9Jkq1Y2wJ2BGgjJNNc2roI9ChREkF06I=";
   };
 
-  vendorHash = "sha256-WRzWtYnoCMbIXNGq402pjpFcXjbzx+UZeg2T76bsE64=";
+  vendorHash = "sha256-SCse0FybcWNLshY0stgbV/AC3Y17znFtAKKhtCaZeGM=";
 
   nativeBuildInputs = [ installShellFiles ];