nur-packages

commit ae44a133f7261a51c58b561e075f7f71b40feeec
parent 42a873782f4ad1973645faaf68ad930d798c0c53
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Wed,  5 Feb 2025 02:05:26 +0400

Up

Diffstat:
M
pkgs/data/maps/slazav/fi.nix
 | 
6
+++---
M
pkgs/data/maps/slazav/hr.nix
 | 
16
+++++++++++++---
M
pkgs/data/maps/slazav/podm.nix
 | 
11
++++++++---
M
pkgs/geospatial/mapsoft/2.nix
 | 
34
++++++++++++++++++++++++++++------

4 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/pkgs/data/maps/slazav/fi.nix b/pkgs/data/maps/slazav/fi.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation {
   pname = "slazav-fi";
-  version = "2025-01-16";
+  version = "2025-02-01";
 
   src = fetchFromGitHub {
     owner = "slazav";
     repo = "map_fi";
-    rev = "31110d93183c2f62b3ec7865442c09f2f5d1c335";
-    hash = "sha256-0qqW4YmJ8klQ4sA5NggMxDeci8Im24UxHYppitScTl8=";
+    rev = "1cc868653012c2a31441ccc0e8246be9666851b2";
+    hash = "sha256-6psZAaBLQ9LvrZgMXKkKHt9k4KJciF9rCZSYsFGjew4=";
     leaveDotGit = true;
   };
 
diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix
@@ -4,8 +4,10 @@
   fetchFromGitHub,
   bc,
   cgpsmapper,
+  fig2dev,
   git,
   gmaptool,
+  imagemagick,
   libjpeg,
   mapsoft2,
   netpbm,
@@ -15,21 +17,28 @@
 
 stdenv.mkDerivation {
   pname = "slazav-hr";
-  version = "2024-12-15";
+  version = "2025-01-27";
 
   src = fetchFromGitHub {
     owner = "slazav";
     repo = "map_hr";
-    rev = "32824f6c621812a8ed12a16d267e215ea39cd2b8";
-    hash = "sha256-EPc4y2Wm0tu2Ah58HHrqz4gsszOyufeTEBnKEJB6xs4=";
+    rev = "947b237a977453db2e5cbb961d5b3842ce770697";
+    hash = "sha256-nXd1y1TVIhwS3XP2DzeFKsDsdYWk2Q6xOtlh9kmve8o=";
     leaveDotGit = true;
   };
 
+  postPatch = ''
+    substituteInPlace vmaps.conf \
+      --replace-fail "/home/sla/mapsoft2/programs/ms2render/" ""
+  '';
+
   nativeBuildInputs = [
     bc
     cgpsmapper
+    fig2dev
     git
     gmaptool
+    imagemagick
     libjpeg
     mapsoft2
     netpbm
@@ -39,6 +48,7 @@ stdenv.mkDerivation {
 
   preBuild = ''
     export HOME=$TMPDIR
+    make -C pics
   '';
 
   buildFlags = [ "out" ];
diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix
@@ -4,8 +4,10 @@
   fetchFromGitHub,
   bc,
   cgpsmapper,
+  fig2dev,
   git,
   gmaptool,
+  imagemagick,
   libjpeg,
   mapsoft2,
   netpbm,
@@ -15,21 +17,23 @@
 
 stdenv.mkDerivation {
   pname = "slazav-podm";
-  version = "2024-12-09";
+  version = "2025-01-27";
 
   src = fetchFromGitHub {
     owner = "slazav";
     repo = "map_podm";
-    rev = "af2c30996e71fcd8dbc4756d289ec2d7e7a198e0";
-    hash = "sha256-hG2oLMTNTZUF/BFIgbS8CYSofjryKyN2fpTqHKjhQcU=";
+    rev = "ab455d4eba552a9cdc6b0356cc59667220b6ac3b";
+    hash = "sha256-ctakSU79ZhsZj1QoZ/1MdT7nOM2fiPB6OzwOnhXAqZM=";
     leaveDotGit = true;
   };
 
   nativeBuildInputs = [
     bc
     cgpsmapper
+    fig2dev
     git
     gmaptool
+    imagemagick
     libjpeg
     mapsoft2
     netpbm
@@ -39,6 +43,7 @@ stdenv.mkDerivation {
 
   preBuild = ''
     export HOME=$TMPDIR
+    make -C pics
   '';
 
   buildFlags = [ "out" ];
diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   substituteAll,
   desktopToDarwinBundle,
   db,
@@ -28,19 +29,41 @@
   wrapGAppsHook,
 }:
 
+let
+  libs = fetchFromGitHub {
+    owner = "slazav";
+    repo = "mapsoft2-libs";
+    rev = "85241c6db623c95c36fc891e413444153739c373";
+    hash = "sha256-Lu4HwszvTnXXGZl5Gs1vNKM4Ww7IY6fpY/Ozf07t3u4=";
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mapsoft2";
-  version = "2.9-alt1";
+  version = "2.9-alt1-unstable-2025-01-29";
 
   src = fetchFromGitHub {
     owner = "slazav";
     repo = "mapsoft2";
-    tag = finalAttrs.version;
-    hash = "sha256-zwjYT/ou8cQxSka+J93ojiLkdAPV9ryz/QPQBvvRTdg=";
-    fetchSubmodules = true;
+    rev = "f97b0f3e41e50398ab135b6a96047ff497ae6b94";
+    hash = "sha256-STXA7/hhm3/fK6WnrYNezymVxUHaKfPdg1Z9kjBeZsQ=";
   };
 
-  patches = [ ./0002-fix-build.patch ] ++ lib.optional (!finalAttrs.doCheck) ./0003-notests.patch;
+  prePatch = ''
+    cp -r ${libs}/* modules
+    chmod -R +w modules
+  '';
+
+  patches = [
+    # https://github.com/slazav/mapsoft2-libs/commit/c0c13a537d4aa6f8d8af530f29408a0ae8c5512c#r152084247
+    (fetchpatch {
+      url = "https://github.com/slazav/mapsoft2-libs/commit/c0c13a537d4aa6f8d8af530f29408a0ae8c5512c.patch";
+      hash = "sha256-uTJnLPwPupUy3c8zr/nx87lA97YQKhQ1nQsr3ltOUE8=";
+      revert = true;
+      stripLen = 1;
+      extraPrefix = "modules/";
+    })
+    ./0002-fix-build.patch
+  ] ++ lib.optional (!finalAttrs.doCheck) ./0003-notests.patch;
 
   postPatch =
     let
@@ -78,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
       substituteInPlace modules/opt/Makefile --replace-fail "SIMPLE_TESTS := opt" ""
       substituteInPlace modules/tmpdir/Makefile --replace-fail "SCRIPT_TESTS := tmpdir" ""
       substituteInPlace modules/get_deps --replace-fail "/usr/bin/perl" "${perlPackages.perl}/bin/perl"
-      substituteInPlace modules/image_cnt/image_cnt.cpp --replace-fail "(pow," "pow("
       patchShebangs .
     '';