Unverified Commit 1ce3f86c authored by Ivan Mincik's avatar Ivan Mincik Committed by GitHub
Browse files

mapnik: 4.0.5 -> 4.0.7 (#394681)

parents 03a0bee9 6ec1bf6d

pkgs/development/libraries/mapnik/default.nix

+3 −13
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 


stdenv.mkDerivation rec {

  pname = "mapnik";

  version = "4.0.5";

  version = "4.0.7";



  src = fetchFromGitHub {

    owner = "mapnik";

    repo = "mapnik";

    rev = "v${version}";

    hash = "sha256-pReoyMdu8RYrberKcwGw0DKmkxVRJezZYcPAM/UAn6o=";

    hash = "sha256-gJktRWcJiSGxxjvWFt+Kl9d7g+TOSPk2PfGP0LIVxt4=";

    fetchSubmodules = true;

  };
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec { 


  postPatch = ''

    substituteInPlace configure \

      --replace '$PYTHON scons/scons.py' ${buildPackages.scons}/bin/scons

      --replace-fail '$PYTHON scons/scons.py' ${buildPackages.scons}/bin/scons

    rm -r scons

    # Remove bundled 'sparsehash' directory in favor of 'sparsehash' package

    rm -r deps/mapnik/sparsehash
@@ -134,15 +134,5 @@ stdenv.mkDerivation rec { 
      ];

    license = licenses.lgpl21Plus;

    platforms = platforms.all;



    # 29-03-2025: On darwin, the libc++ standard library is used to compile C++ programs.

    # 29-03-2025: Since the base template for `std::char_traits` was removed in LLVM 19,

    # 29-03-2025: usages of `boost::u32regex` will no longer compile.

    # 29-03-2025: Linux builds do not fail as they use libstdc++, which has not removed

    # 29-03-2025: such `std::char_trait` declarations.

    #

    # 29-03-2025: See https://github.com/mapnik/mapnik/issues/4499 for more information

    # 29-03-2025: and a Minimal Reproducible Example.

    badPlatforms = platforms.darwin;

  };

}

pkgs/development/python-modules/python-mapnik/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ buildPythonPackage rec { 
      "test_pdf_printing"

      "test_render_with_scale_factor"

      "test_raster_warping"

      "test_pycairo_svg_surface1"

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      "test_passing_pycairo_context_png"
@@ -121,7 +122,6 @@ buildPythonPackage rec { 
      "test_pycairo_pdf_surface1"

      "test_pycairo_pdf_surface2"

      "test_pycairo_pdf_surface3"

      "test_pycairo_svg_surface1"

      "test_pycairo_svg_surface2"

      "test_pycairo_svg_surface3"

    ];