Up

sikmir · Jan 18, 2025 · 0adf4c0 · 0adf4c0
1 parent 21512e9
commit 0adf4c0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 23 deletions.
diff --git a/pkgs/data/maps/slazav/fi.nix b/pkgs/data/maps/slazav/fi.nix
@@ -15,16 +15,21 @@
 
 stdenv.mkDerivation {
   pname = "slazav-fi";
-  version = "2025-01-07";
+  version = "2025-01-16";
 
   src = fetchFromGitHub {
     owner = "slazav";
     repo = "map_fi";
-    rev = "f3f13bd52cfd6a9775af35dea7343902d17dd258";
-    hash = "sha256-GYLMbsNlBBt3hdCKZwc7BxTgaVf0KmcB0kFYC5dk4kM=";
+    rev = "31110d93183c2f62b3ec7865442c09f2f5d1c335";
+    hash = "sha256-0qqW4YmJ8klQ4sA5NggMxDeci8Im24UxHYppitScTl8=";
     leaveDotGit = true;
   };
 
+  postPatch = ''
+    substituteInPlace vmaps.conf \
+      --replace-fail "/home/sla/mapsoft2/programs/ms2render/" ""
+  '';
+
   nativeBuildInputs = [
     bc
     cgpsmapper
@@ -41,10 +46,7 @@ stdenv.mkDerivation {
     export HOME=$TMPDIR
   '';
 
-  buildFlags = [
-    "in"
-    "out"
-  ];
+  buildFlags = [ "out" ];
 
   installPhase = ''
     install -Dm644 OUT/* -t $out

diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix
@@ -41,10 +41,7 @@ stdenv.mkDerivation {
     export HOME=$TMPDIR
   '';
 
-  buildFlags = [
-    "in"
-    "out"
-  ];
+  buildFlags = [ "out" ];
 
   installPhase = ''
     install -Dm644 OUT/* -t $out

diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix
@@ -41,10 +41,7 @@ stdenv.mkDerivation {
     export HOME=$TMPDIR
   '';
 
-  buildFlags = [
-    "in"
-    "out"
-  ];
+  buildFlags = [ "out" ];
 
   installPhase = ''
     install -Dm644 OUT/* -t $out

diff --git a/pkgs/misc/mitzasql/default.nix b/pkgs/misc/mitzasql/default.nix
@@ -15,14 +15,6 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-C/KecK8PJDn/MyUxtxFLjVnkra6pW9QoLY34FWkwQ+8=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "pygments ==2.7.4" "pygments" \
-      --replace-fail "mysql-connector-python ==8.0.22" "mysql-connector-python" \
-      --replace-fail "urwid ==2.1.2" "urwid" \
-      --replace-fail "appdirs ==1.4.4" "appdirs"
-  '';
-
   dependencies = with python3Packages; [
     appdirs
     pygments