From 158a4b09580c4224044552f0540419c39922366d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Oct 2023 03:36:40 +0000 Subject: [PATCH 1/2] martin: 0.8.7 -> 0.9.0 --- pkgs/servers/geospatial/martin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix index d5c7868d4de..458c60b721d 100644 --- a/pkgs/servers/geospatial/martin/default.nix +++ b/pkgs/servers/geospatial/martin/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "martin"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitHub { owner = "maplibre"; repo = "martin"; rev = "v${version}"; - hash = "sha256-/t4SPZ4LoT3dR1jyqTmrBSRnWhyT7zSkx1Y10+JpMsI="; + hash = "sha256-dx6TcEZpnsWbRliBo/CkOZNwXiipRYS8+oWHTEAF5XQ="; }; - cargoHash = "sha256-3yib8F6n6uxC8G7yO3I1TquAMK/FbvOwdNJT9VCk3+g="; + cargoHash = "sha256-6r2rrSthEdQ/CnrGt4/VZW2jp66zE0au8r81+nBD8UE="; nativeBuildInputs = [ pkg-config ]; From a2ad48c94e5d2cd0bdc21a68a27b7ce71b03b740 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 6 Oct 2023 16:32:35 +0400 Subject: [PATCH 2/2] martin: fix darwin --- pkgs/servers/geospatial/martin/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix index 458c60b721d..3a5ec55b5b1 100644 --- a/pkgs/servers/geospatial/martin/default.nix +++ b/pkgs/servers/geospatial/martin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "martin"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; checkFlags = [ "--skip function_source_schemas" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44739bbaa12..8988c3c7732 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27722,7 +27722,7 @@ with pkgs; mapserver = callPackage ../servers/geospatial/mapserver { }; martin = callPackage ../servers/geospatial/martin { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; mbtileserver = callPackage ../servers/geospatial/mbtileserver { };