From a9e2aef0338d565bc4ebd901c56e477a00af7cd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Oct 2024 15:05:40 +0000 Subject: [PATCH 1/2] mapserver: 8.2.1 -> 8.2.2 --- pkgs/by-name/ma/mapserver/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index 5d1739d07c07..7e8820ba582f 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "mapserver"; - version = "8.2.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "MapServer"; repo = "MapServer"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-kZEDC89yoQP0ma5avp6r+Hz8JMpErGlBVQkhlHO6UFw="; + hash = "sha256-tub0Jd1IUkONQ5Mqz8urihbrcFLlOQybLhOvzkcwW54="; }; nativeBuildInputs = From 61ef66f8e7605fb8228cc6e9ceea0163d9b4a5b1 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 18 Oct 2024 20:17:26 +0400 Subject: [PATCH 2/2] mapserver: modernize --- pkgs/by-name/ma/mapserver/package.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index 7e8820ba582f..43996b4c92d5 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -70,23 +70,24 @@ stdenv.mkDerivation rec { ] ++ lib.optional withPython python3; cmakeFlags = [ - "-DWITH_KML=ON" - "-DWITH_SOS=ON" - "-DWITH_RSVG=ON" - "-DWITH_CURL=ON" - "-DWITH_CLIENT_WMS=ON" - "-DWITH_CLIENT_WFS=ON" + (lib.cmakeBool "WITH_KML" true) + (lib.cmakeBool "WITH_SOS" true) + (lib.cmakeBool "WITH_RSVG" true) + (lib.cmakeBool "WITH_CURL" true) + (lib.cmakeBool "WITH_CLIENT_WMS" true) + (lib.cmakeBool "WITH_CLIENT_WFS" true) + (lib.cmakeBool "WITH_PYTHON" withPython) # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ] ++ lib.optional withPython "-DWITH_PYTHON=ON"; + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + ]; - meta = with lib; { + meta = { description = "Platform for publishing spatial data and interactive mapping applications to the web"; homepage = "https://mapserver.org/"; changelog = "https://mapserver.org/development/changelog/"; - license = licenses.mit; - maintainers = teams.geospatial.members; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = lib.teams.geospatial.members; + platforms = lib.platforms.unix; }; }