From bee04657e9287af20f3f214a7e7af10167d2e7f9 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 18 Mar 2026 20:31:14 +0400
Subject: [PATCH 1/2] =?UTF-8?q?tilemaker:=203.0.0=20=E2=86=92=203.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ti/tilemaker/package.nix | 28 ++++++---------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/ti/tilemaker/package.nix b/pkgs/by-name/ti/tilemaker/package.nix
index 82e7840c5c4f..507ac635efff 100644
--- a/pkgs/by-name/ti/tilemaker/package.nix
+++ b/pkgs/by-name/ti/tilemaker/package.nix
@@ -3,9 +3,7 @@
   stdenv,
   fetchFromGitHub,
   buildPackages,
-  fetchpatch,
   cmake,
-  installShellFiles,
   boost,
   lua,
   protobuf_21,
@@ -13,28 +11,20 @@
   shapelib,
   sqlite,
   zlib,
-  testers,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tilemaker";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "systemed";
     repo = "tilemaker";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-rB5oP03yaIzklwkGsIeS9ELbHOY9AObwjRrK9HBQFI4=";
+    hash = "sha256-0reO4YYxbFM75CQrSLTybsb5g6PhJaShAtT+X3CaPfM=";
   };
 
-  patches = [
-    # fixes for Boost 1.86
-    (fetchpatch {
-      url = "https://github.com/systemed/tilemaker/commit/6509f0cf50943a90b36b5c6802118b72124b1e7a.patch";
-      hash = "sha256-C4aCUGTTUtY24oARihMnljjRbw80xRdMUyvu/b1Nsdw=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace src/options_parser.cpp \
       --replace-fail "config.json" "$out/share/tilemaker/config-openmaptiles.json" \
@@ -43,10 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "default_value(\"static\")" "default_value(\"$out/share/tilemaker/static\")"
   '';
 
-  nativeBuildInputs = [
-    cmake
-    installShellFiles
-  ];
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [
     boost
@@ -65,15 +52,12 @@ stdenv.mkDerivation (finalAttrs: {
   env.NIX_CFLAGS_COMPILE = toString [ "-DTM_VERSION=${finalAttrs.version}" ];
 
   postInstall = ''
-    installManPage ../docs/man/tilemaker.1
     install -Dm644 ../resources/*.{json,lua} -t $out/share/tilemaker
     cp -r ../server/static $out/share/tilemaker
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = finalAttrs.finalPackage;
-    command = "tilemaker --help";
-  };
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
   meta = {
     description = "Make OpenStreetMap vector tiles without the stack";

From 9c30d8e3bee4b124bf6d441823831f88e75caaed Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 19 Mar 2026 18:13:49 +0400
Subject: [PATCH 2/2] tilemaker: adopt by geospatial team

---
 pkgs/by-name/ti/tilemaker/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ti/tilemaker/package.nix b/pkgs/by-name/ti/tilemaker/package.nix
index 507ac635efff..ffa2fdaf8b26 100644
--- a/pkgs/by-name/ti/tilemaker/package.nix
+++ b/pkgs/by-name/ti/tilemaker/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://tilemaker.org/";
     changelog = "https://github.com/systemed/tilemaker/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.free; # FTWPL
-    maintainers = with lib.maintainers; [ sikmir ];
+    teams = [ lib.teams.geospatial ];
     platforms = lib.platforms.unix;
     mainProgram = "tilemaker";
   };