From 0b3e905bf9e89c314ade61cbb4915d9697c8b456 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 17 Jul 2026 00:16:52 +0400 Subject: [PATCH] =?UTF-8?q?martin:=201.10.1=20=E2=86=92=201.12.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ma/martin/package.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ma/martin/package.nix b/pkgs/by-name/ma/martin/package.nix index 7c1807168515..f957e7424d17 100644 --- a/pkgs/by-name/ma/martin/package.nix +++ b/pkgs/by-name/ma/martin/package.nix @@ -7,6 +7,7 @@ rustPlatform, pkg-config, curl, + libuv, libz, openssl, postgresql, @@ -16,21 +17,21 @@ let # check package.metadata.mln in https://github.com/maplibre/maplibre-native-rs/blob/main/Cargo.toml - mlnRelease = "core-9b6325a14e2cf1cc29ab28c1855ad376f1ba4903"; + mlnRelease = "core-fa8a9c8e3261ce64940127aecc1d52f540c21c57"; mlnHeaders = fetchurl { url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/maplibre-native-headers.tar.gz"; - hash = "sha256-VjVEc/+IZTBG9ixP/i7oeel+7gy3+DhSEOi2UDIqeLc="; + hash = "sha256-SqZaqePNbqBZoUgMJIsZf0zqKc8EAwInYNRciv/jX1A="; }; mlnLibrary = fetchurl ( let sources = { aarch64-linux = { url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/libmaplibre-native-core-amalgam-linux-arm64-vulkan.a"; - hash = "sha256-PHFNdzcG3+kngZmziMccCTnwBUbtsS2RAUNkTyNYXmc"; + hash = "sha256-iug/ZEIoM0LUczPkVbzVelILoc1uzsM519V2em7Va4U="; }; x86_64-linux = { url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/libmaplibre-native-core-amalgam-linux-x64-vulkan.a"; - hash = "sha256-T9H7NiXHv+hbMgOd5QetQzxjIX1Ufn6gNmBJJ/7Ha50="; + hash = "sha256-FoUFDoUw+eM/aaXMfO7iuoUrv8gUGVdBW1tiqxjYCbI="; }; }; in @@ -46,18 +47,18 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "martin"; - version = "1.10.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "maplibre"; repo = "martin"; tag = "martin-v${finalAttrs.version}"; - hash = "sha256-Zu3vkU7HQcSqzCL7n0uX4M+DxBDMC0Sii7esxM9AtpA="; + hash = "sha256-zCiyJw79KBrK/JqZFx93cPeCnS02/HrH+F1A6EBras0="; }; patches = [ ./dont-build-webui.patch ]; - cargoHash = "sha256-OPuUvm4ez5TZUWwJ6D6fqy++cCiVt7f1qP6OPdsOEDA="; + cargoHash = "sha256-1VSErzoJ0Xdzefaq++8lCGnJfh7LyQCsWmq1xSl4iqg="; webui = buildNpmPackage { pname = "martin-ui"; @@ -71,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ln -sf ${finalAttrs.src}/demo/frontend/public/favicon.ico public/_/assets/favicon.ico ''; - npmDepsHash = "sha256-lX5FSWAQyy4Sa7OPnNyTYttjHiPuYxgrPsmZpwCnpO8="; + npmDepsHash = "sha256-4BNjrYMAB8VBwCD4bREWw2vXwE9FCdfOFHsRgYNdiBI="; buildPhase = '' runHook preBuild @@ -99,6 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ curl + libuv libz openssl ];