From 6515ce002a3fef9441eae60b894594b466ed1ec8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 00:30:48 +0000 Subject: [PATCH 1/4] mapcache: 1.14.0 -> 1.14.1 --- 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 3fa78b0c10f9..747686c8af60 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.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "MapServer"; repo = pname; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-+QP4xXhP+MNqnhMUtMdtKrcuJ0M2BXWu3mbxXzj5ybc="; + sha256 = "sha256-AwdZdOEq9SZ5VzuBllg4U1gdVxZ9IVdqiDrn3QuRdCk="; }; nativeBuildInputs = [ From 4a1623f712639ef6e5d01aa17a85a6edd1cacf94 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 4 Aug 2024 12:35:00 +0400 Subject: [PATCH 2/4] mapcache: migrate to by-name --- .../mapcache/default.nix => by-name/ma/mapcache/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/geospatial/mapcache/default.nix => by-name/ma/mapcache/package.nix} (100%) diff --git a/pkgs/servers/geospatial/mapcache/default.nix b/pkgs/by-name/ma/mapcache/package.nix similarity index 100% rename from pkgs/servers/geospatial/mapcache/default.nix rename to pkgs/by-name/ma/mapcache/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a529941abd26..af8250b62dda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26309,8 +26309,6 @@ with pkgs; fit-trackee = callPackage ../servers/geospatial/fit-trackee { }; - mapcache = callPackage ../servers/geospatial/mapcache { }; - mapproxy = callPackage ../servers/geospatial/mapproxy { }; mapserver = callPackage ../servers/geospatial/mapserver { }; From b3c8a5e7f8daa5baaecaa63639861c233bc70952 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 4 Aug 2024 20:04:01 +0400 Subject: [PATCH 3/4] mapcache: switch to pcre2 --- pkgs/by-name/ma/mapcache/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ma/mapcache/package.nix b/pkgs/by-name/ma/mapcache/package.nix index 747686c8af60..640cd07985d7 100644 --- a/pkgs/by-name/ma/mapcache/package.nix +++ b/pkgs/by-name/ma/mapcache/package.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , apacheHttpd, apr, aprutil, curl, db, fcgi, gdal, geos -, libgeotiff, libjpeg, libpng, libtiff, pcre, pixman, proj, sqlite, zlib +, libgeotiff, libjpeg, libpng, libtiff, pcre2, pixman, proj, sqlite, zlib }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff - pcre + pcre2 pixman proj sqlite @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DWITH_BERKELEY_DB=ON" - "-DWITH_MEMCACHE=ON" - "-DWITH_TIFF=ON" - "-DWITH_GEOTIFF=ON" - "-DWITH_PCRE=ON" - "-DAPACHE_MODULE_DIR=${placeholder "out"}/modules" + (lib.cmakeBool "WITH_BERKELEY_DB" true) + (lib.cmakeBool "WITH_MEMCACHE" true) + (lib.cmakeBool "WITH_TIFF" true) + (lib.cmakeBool "WITH_GEOTIFF" true) + (lib.cmakeBool "WITH_PCRE2" true) + (lib.cmakeFeature "APACHE_MODULE_DIR" "${placeholder "out"}/modules") ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-std=c99"; From 68d36ee87be5cc178d428a3c84b0c2cf4d27d342 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 5 Aug 2024 01:43:54 +0400 Subject: [PATCH 4/4] mapcache: format with nixfmt-rfc-style --- pkgs/by-name/ma/mapcache/package.nix | 38 +++++++++++++++++++++------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ma/mapcache/package.nix b/pkgs/by-name/ma/mapcache/package.nix index 640cd07985d7..e0859a91a2fe 100644 --- a/pkgs/by-name/ma/mapcache/package.nix +++ b/pkgs/by-name/ma/mapcache/package.nix @@ -1,6 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, apacheHttpd, apr, aprutil, curl, db, fcgi, gdal, geos -, libgeotiff, libjpeg, libpng, libtiff, pcre2, pixman, proj, sqlite, zlib +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + apacheHttpd, + apr, + aprutil, + curl, + db, + fcgi, + gdal, + geos, + libgeotiff, + libjpeg, + libpng, + libtiff, + pcre2, + pixman, + proj, + sqlite, + zlib, }: stdenv.mkDerivation rec { @@ -9,9 +29,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "MapServer"; - repo = pname; + repo = "mapcache"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-AwdZdOEq9SZ5VzuBllg4U1gdVxZ9IVdqiDrn3QuRdCk="; + hash = "sha256-AwdZdOEq9SZ5VzuBllg4U1gdVxZ9IVdqiDrn3QuRdCk="; }; nativeBuildInputs = [ @@ -50,12 +70,12 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-std=c99"; - meta = with lib; { + meta = { description = "Server that implements tile caching to speed up access to WMS layers"; homepage = "https://mapserver.org/mapcache/"; changelog = "https://www.mapserver.org/development/changelog/mapcache/"; - license = licenses.mit; - maintainers = teams.geospatial.members; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = lib.teams.geospatial.members; + platforms = lib.platforms.unix; }; }