From 2da6994e17d885d953b2009f4c7ac56244cb813e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Feb 2023 21:58:28 +0000 Subject: [PATCH 1/2] mapcache: 1.12.1 -> 1.14.0 --- pkgs/servers/geospatial/mapcache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/geospatial/mapcache/default.nix b/pkgs/servers/geospatial/mapcache/default.nix index 3eae9c2b33cb..eea321abb22f 100644 --- a/pkgs/servers/geospatial/mapcache/default.nix +++ b/pkgs/servers/geospatial/mapcache/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mapcache"; - version = "1.12.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "MapServer"; repo = pname; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-NuiZMWcmsN5wDCd37Hvj3cazwT3Ea+OknV/YR3urZB0="; + sha256 = "sha256-+QP4xXhP+MNqnhMUtMdtKrcuJ0M2BXWu3mbxXzj5ybc="; }; nativeBuildInputs = [ From 87208cc7daf6542a9be4701a97db7a42d02ec951 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 7 Feb 2023 02:10:23 +0300 Subject: [PATCH 2/2] mapcache: fix build on darwin --- pkgs/servers/geospatial/mapcache/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/geospatial/mapcache/default.nix b/pkgs/servers/geospatial/mapcache/default.nix index eea321abb22f..781edfce98c8 100644 --- a/pkgs/servers/geospatial/mapcache/default.nix +++ b/pkgs/servers/geospatial/mapcache/default.nix @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { "-DAPACHE_MODULE_DIR=${placeholder "out"}/modules" ]; + NIX_CFLAGS_COMPILE = "-std=c99"; + meta = with lib; { description = "A server that implements tile caching to speed up access to WMS layers"; homepage = "https://mapserver.org/mapcache/";