lol

mapnik: unstable-2022-04-14 -> unstable-2022-10-18

+6 -7
+2 -2
pkgs/development/libraries/mapnik/cmake-harfbuzz.patch
··· 1 1 diff --git a/CMakeLists.txt b/CMakeLists.txt 2 - index f2dc1f02d..739b8ae99 100644 2 + index d87a7052d..837867551 100644 3 3 --- a/CMakeLists.txt 4 4 +++ b/CMakeLists.txt 5 5 @@ -153,19 +153,8 @@ endif() ··· 12 12 - message(STATUS "Found harfbuzz native cmake") 13 13 - list(APPEND MAPNIK_OPTIONAL_LIBS harfbuzz::harfbuzz) 14 14 -else() 15 - - # Use pkg-config when harfbuzz is not found. 15 + - # Use pkg-config when harfbuzz is not found. 16 16 - # It might be possible that in future version harfbuzz could only be found via pkg-config. 17 17 - # harfbuzz related discussion: https://github.com/harfbuzz/harfbuzz/issues/2653 18 18 - message(STATUS "harfbuzz not found via cmake. Searching via pkg-config...")
+3 -3
pkgs/development/libraries/mapnik/default.nix
··· 26 26 27 27 stdenv.mkDerivation rec { 28 28 pname = "mapnik"; 29 - version = "unstable-2022-04-14"; 29 + version = "unstable-2022-10-18"; 30 30 31 31 src = fetchFromGitHub { 32 32 owner = "mapnik"; 33 33 repo = "mapnik"; 34 - rev = "1ba1278b4227ccd887a95880d1c75aa6446132fc"; 35 - sha256 = "sha256-dtu+PKpK/crO5cZje0aj+vB9beG0eU6fyT9GNtvvtbM="; 34 + rev = "05661e54392bcbb3367747f97a3ef6e468c105ba"; 35 + hash = "sha256-96AneLPH1gbh/u880Pdc9OdFq2MniSdaTJoKYqId7sw="; 36 36 fetchSubmodules = true; 37 37 }; 38 38
-1
pkgs/top-level/all-packages.nix
··· 21066 21066 harfbuzz = harfbuzz.override { 21067 21067 withIcu = true; 21068 21068 }; 21069 - boost = boost175; 21070 21069 }; 21071 21070 21072 21071 manticoresearch = callPackage ../servers/search/manticoresearch { };
+1 -1
pkgs/top-level/python-packages.nix
··· 9000 9000 9001 9001 python-mapnik = callPackage ../development/python-modules/python-mapnik rec { 9002 9002 inherit (pkgs) pkg-config cairo icu libjpeg libpng libtiff libwebp proj zlib; 9003 - boost = pkgs.boost175.override { 9003 + boost = pkgs.boost.override { 9004 9004 enablePython = true; 9005 9005 inherit python; 9006 9006 };