From 964ba3780424848602535315e8c125ced8d98e5e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 7 Feb 2024 23:22:02 +0000 Subject: [PATCH] geos_3_9: 3.9.2 -> 3.9.5 The main change is the build fix against `gcc-13` in` master https://hydra.nixos.org/build/247700560: In file included from WKTWriter.cpp:21: ../../include/geos/io/WKTWriter.h:177:29: error: 'uint8_t' has not been declared 177 | void setOutputDimension(uint8_t newOutputDimension); | ^~~~~~~ --- pkgs/development/libraries/geos/3.9.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/geos/3.9.nix b/pkgs/development/libraries/geos/3.9.nix index 415746d3e544..cc3025928c80 100644 --- a/pkgs/development/libraries/geos/3.9.nix +++ b/pkgs/development/libraries/geos/3.9.nix @@ -1,22 +1,22 @@ { lib , stdenv , fetchurl +, cmake , testers }: stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.9.2"; + version = "3.9.5"; src = fetchurl { url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-RKWpviHX1HNDa/Yhwt3MPPWou+PHhuEyKWGKO52GEpc="; + hash = "sha256-xsmu36iGT7RLp4kRQIRCOCv9BpDPLUCRrjgFyGN4kDY="; }; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; - # https://trac.osgeo.org/geos/ticket/993 - configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; + enableParallelBuilding = true; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;