From 4ad0cfd3c4a839f9553904eae4540945e5aa9690 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Mon, 21 Apr 2025 13:21:35 +0200
Subject: [PATCH] osrm-backend: 5.27.1-unstable-2024-11-03 -> 6.0.0

Changelog: https://github.com/Project-OSRM/osrm-backend/blob/V6.0.0/CHANGELOG.md
---
 .../os/osrm-backend/boost187-compat.patch     | 14 -------------
 pkgs/by-name/os/osrm-backend/package.nix      | 21 +++++++------------
 2 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/by-name/os/osrm-backend/boost187-compat.patch

diff --git a/pkgs/by-name/os/osrm-backend/boost187-compat.patch b/pkgs/by-name/os/osrm-backend/boost187-compat.patch
deleted file mode 100644
index 4c5aa5eb05a8..000000000000
--- a/pkgs/by-name/os/osrm-backend/boost187-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/include/server/server.hpp b/include/server/server.hpp
-index 34b8982e67a..02b0dda050d 100644
---- a/include/server/server.hpp
-+++ b/include/server/server.hpp
-@@ -53,8 +53,7 @@ class Server
-         const auto port_string = std::to_string(port);
- 
-         boost::asio::ip::tcp::resolver resolver(io_context);
--        boost::asio::ip::tcp::resolver::query query(address, port_string);
--        boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
-+        boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(address, port_string).begin();
- 
-         acceptor.open(endpoint.protocol());
- #ifdef SO_REUSEPORT
diff --git a/pkgs/by-name/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix
index cc27fa5b2f73..de9207b66365 100644
--- a/pkgs/by-name/os/osrm-backend/package.nix
+++ b/pkgs/by-name/os/osrm-backend/package.nix
@@ -10,30 +10,25 @@
   boost,
   lua,
   luabind,
-  tbb_2021_11,
+  tbb_2022_0,
   expat,
   nixosTests,
 }:
 
 let
-  tbb = tbb_2021_11;
+  tbb = tbb_2022_0;
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "osrm-backend";
-  version = "5.27.1-unstable-2024-11-03";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "Project-OSRM";
     repo = "osrm-backend";
-    rev = "3614af7f6429ee35c3f2e836513b784a74664ab6";
-    hash = "sha256-iix++G49cC13wZGZIpXu1SWGtVAcqpuX3GhsIaETzUU=";
+    tag = "V${version}";
+    hash = "sha256-R2Sx+DbT6gROI8X1fkxqOGbMqgmsnNiw2rUX6gSZuTs=";
   };
 
-  patches = [
-    # Taken from https://github.com/Project-OSRM/osrm-backend/pull/7073.
-    ./boost187-compat.patch
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -63,9 +58,9 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    homepage = "https://github.com/Project-OSRM/osrm-backend/wiki";
+    homepage = "https://project-osrm.org/";
     description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project";
-    changelog = "https://github.com/Project-OSRM/osrm-backend/blob/master/CHANGELOG.md";
+    changelog = "https://github.com/Project-OSRM/osrm-backend/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ erictapen ];
     platforms = lib.platforms.unix;