From 4147f4a424d92d0d350e80eca4669ffa0755e26d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 11:40:38 +0200 Subject: [PATCH] osmscout-server: 3.0.0 -> 3.1.0 --- .../misc/osmscout-server/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix index 05688d22bd18..4772ac454fc6 100644 --- a/pkgs/applications/misc/osmscout-server/default.nix +++ b/pkgs/applications/misc/osmscout-server/default.nix @@ -30,13 +30,13 @@ let in mkDerivation rec { pname = "osmscout-server"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "rinigus"; repo = "osmscout-server"; rev = version; - hash = "sha256-jcg/0SKeLviEC+vszh5DployKDAI7N+a8lzvImzFTvY="; + hash = "sha256-GqUXHn3ZK8gdDlm3TitEp/jhBpQoVeQZUCfAyiyrDEg="; fetchSubmodules = true; }; @@ -47,19 +47,6 @@ mkDerivation rec { libpostal sqlite marisa kyotocabinet boost protobuf date ]; - patches = [ - # Valhalla 3.2.1 support. Only required for next patch to apply cleanly - (fetchpatch { - url = "https://github.com/rinigus/osmscout-server/commit/1df9d383e61dd14cbe9e5b52412a2e951cee2ee4.patch"; - hash = "sha256-h+YTyHr4RYgwH5bfVgyujSekbL2LfV8vJgVkjXT0I10="; - }) - # Valhalla 3.4.0 support - (fetchpatch { - url = "https://github.com/rinigus/osmscout-server/commit/fe6562a4c3ba5da2735232ea8fdc7f71d7e7e714.patch"; - hash = "sha256-wibLTFk3cFS5mcC71TgMA9ZAAHS3mbjboFHqax6nCxs="; - }) - ]; - qmakeFlags = [ "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant "CONFIG+=disable_mapnik" # Disable the optional mapnik backend