nur-packages

commit 9435a91b24c0945e1973b0acf215880a81ada4bd
parent 5db835175084018c123a4ee05f2fc3b31ec3b38f
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Sun, 13 Jul 2025 16:50:23 +0400

Up

Diffstat:
M
pkgs/default.nix
 | 
2
+-
M
pkgs/garmin/garminimg/default.nix
 | 
15
+++------------
M
pkgs/geospatial/elevation/default.nix
 | 
1
+

3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -136,7 +136,7 @@ lib.makeScope newScope (
     basecamp = callPackage ./garmin/basecamp { };
     cgpsmapper = callPackage ./garmin/cgpsmapper { };
     garmin-uploader = callPackage ./garmin/garmin-uploader { };
-    garminimg = libsForQt5.callPackage ./garmin/garminimg { proj = pkgs.proj_7; };
+    garminimg = libsForQt5.callPackage ./garmin/garminimg { };
     gimgtools = callPackage ./garmin/gimgtools { };
     gmaptool = callPackage ./garmin/gmaptool { };
     imgdecode = callPackage ./garmin/imgdecode { };
diff --git a/pkgs/garmin/garminimg/default.nix b/pkgs/garmin/garminimg/default.nix
@@ -10,23 +10,15 @@
 
 stdenv.mkDerivation {
   pname = "garminimg";
-  version = "0-unstable-2021-01-07";
+  version = "0-unstable-2024-11-26";
 
   src = fetchFromGitHub {
     owner = "kiozen";
     repo = "GarminImg";
-    rev = "6bfd029e9712b47eeab144bfe150baccd8c879bd";
-    hash = "sha256-6vNN80NJSo2GdGruUKTupMcWOR7E3vo2SD1fAkMCodE=";
+    rev = "0df6d7f5eafaed26054a64a593707297e4f435df";
+    hash = "sha256-QkW3dri3qWMY1iLBH9+woHZ8CB/wD+QcTFw7sEW1b1k=";
   };
 
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "PROJ4" "PROJ"
-    substituteInPlace srcEncodeImg/CMakeLists.txt \
-      --replace-fail "PROJ4_" "PROJ_"
-    substituteInPlace srcDecodeImg/CMakeLists.txt \
-      --replace-fail "PROJ4_" "PROJ_"
-  '';
 
   nativeBuildInputs = [
     cmake
@@ -50,6 +42,5 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.sikmir ];
     platforms = lib.platforms.unix;
-    broken = true; # proj_7 is broken
   };
 }
diff --git a/pkgs/geospatial/elevation/default.nix b/pkgs/geospatial/elevation/default.nix
@@ -36,6 +36,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   postPatch = ''
+    substituteInPlace pyproject.toml --replace-fail "\"setuptools_scm_git_archive\"," ""
     substituteInPlace tests/test_datasource.py --replace-fail "/tmp" "./tmp"
     for f in elevation/datasource.* \
              elevation/util.py \