From a2423f21102a9073d56bff697e1b467843c3cafc Mon Sep 17 00:00:00 2001
From: Karl Beecken <karl@beecken.berlin>
Date: Fri, 31 Jul 2026 13:16:41 +0200
Subject: [PATCH 1/3] valhalla: 3.6.3 -> 3.8.3

https://github.com/valhalla/valhalla/blob/3.8.3/CHANGELOG.md

- gdal was replaced by libgeotiff/libtiff upstream
- python bindings moved from pybind11 to nanobind
- spatialite-tools added for configure
- new dependencies for data tools: openssl and expat
- remove protobuf 21 + boost-python pins, aren't needed anymore
---
 .../libraries/valhalla/default.nix            | 26 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               | 12 +--------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/development/libraries/valhalla/default.nix
index d04e95489d14..c413808d84d5 100644
--- a/pkgs/development/libraries/valhalla/default.nix
+++ b/pkgs/development/libraries/valhalla/default.nix
@@ -7,30 +7,35 @@
   boost,
   curl,
   cxxopts,
-  gdal,
+  expat,
   geos,
+  libgeotiff,
   libspatialite,
+  libtiff,
   luajit,
   lz4,
+  openssl,
   prime-server,
   protobuf,
   python3,
   rapidjson,
+  spatialite-tools,
   sqlite,
   zeromq,
   zlib,
   testers,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "valhalla";
-  version = "3.6.3";
+  version = "3.8.3";
 
   src = fetchFromGitHub {
     owner = "valhalla";
     repo = "valhalla";
     tag = finalAttrs.version;
-    hash = "sha256-Q+h1k26UPiZEVhtonjipUS6gGIUZHM16pYgCxq/Zav0=";
+    hash = "sha256-wWiiadJqoZylV2YK+mu+cQBfd597id39RQgwaQDtvW4=";
     fetchSubmodules = true;
   };
 
@@ -42,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
+    spatialite-tools
   ];
 
   cmakeFlags = [
@@ -59,15 +65,18 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     boost
     cxxopts
+    expat
+    libgeotiff
+    libtiff
     lz4
-    (python3.withPackages (ps: [ ps.pybind11 ]))
+    openssl
+    python3
     rapidjson
     zeromq
   ];
 
   propagatedBuildInputs = [
     curl
-    gdal
     geos
     libspatialite
     luajit
@@ -77,8 +86,11 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ];
 
-  passthru.tests = {
-    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  passthru = {
+    tests = {
+      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    };
+    updateScript = nix-update-script { };
   };
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17754b9aa31d..e373ac75d85f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6738,17 +6738,7 @@ with pkgs;
 
   valeStyles = recurseIntoAttrs (callPackages ../by-name/va/vale/styles.nix { });
 
-  valhalla = callPackage ../development/libraries/valhalla {
-    boost = boost.override {
-      enablePython = true;
-      python = python3;
-    };
-    protobuf = protobuf_21.override {
-      abseil-cpp = abseil-cpp_202103.override {
-        cxxStandard = "17";
-      };
-    };
-  };
+  valhalla = callPackage ../development/libraries/valhalla { };
 
   vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; };
 

From c12fda4aebc9ce91bc53bdfe407895c9fd8cba30 Mon Sep 17 00:00:00 2001
From: Karl Beecken <karl@beecken.berlin>
Date: Fri, 31 Jul 2026 13:16:46 +0200
Subject: [PATCH 2/3] valhalla: migrate to pkgs/by-name

---
 .../valhalla/default.nix => by-name/va/valhalla/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/valhalla/default.nix => by-name/va/valhalla/package.nix} (100%)

diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/by-name/va/valhalla/package.nix
similarity index 100%
rename from pkgs/development/libraries/valhalla/default.nix
rename to pkgs/by-name/va/valhalla/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e373ac75d85f..8d75916f4d87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6738,8 +6738,6 @@ with pkgs;
 
   valeStyles = recurseIntoAttrs (callPackages ../by-name/va/vale/styles.nix { });
 
-  valhalla = callPackage ../development/libraries/valhalla { };
-
   vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; };
 
   vid-stab = callPackage ../development/libraries/vid-stab {

From b5d66a98db3de26e1774b03a0c5a380bb8b6d300 Mon Sep 17 00:00:00 2001
From: Karl Beecken <karl@beecken.berlin>
Date: Fri, 31 Jul 2026 13:18:44 +0200
Subject: [PATCH 3/3] valhalla: add karlbeecken to maintainers

---
 pkgs/by-name/va/valhalla/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/va/valhalla/package.nix b/pkgs/by-name/va/valhalla/package.nix
index c413808d84d5..227c31b5b12d 100644
--- a/pkgs/by-name/va/valhalla/package.nix
+++ b/pkgs/by-name/va/valhalla/package.nix
@@ -98,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Open Source Routing Engine for OpenStreetMap";
     homepage = "https://valhalla.readthedocs.io/";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.Thra11 ];
+    maintainers = with lib.maintainers; [
+      Thra11
+      karlbeecken
+    ];
     pkgConfigModules = [ "libvalhalla" ];
     platforms = lib.platforms.unix;
   };