From 1b2bab090cf0a4bb8eefec62bf382263bbecf122 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Wed, 6 Dec 2023 15:56:33 +0100 Subject: [PATCH] geos: keep version 3.11 of package Keep old version of package due to requirements of following packages: * kikit * pygeos --- pkgs/development/libraries/geos/3.11.nix | 47 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/geos/3.11.nix diff --git a/pkgs/development/libraries/geos/3.11.nix b/pkgs/development/libraries/geos/3.11.nix new file mode 100644 index 000000000000..90bdfdb0d605 --- /dev/null +++ b/pkgs/development/libraries/geos/3.11.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, callPackage +, fetchpatch +, fetchurl +, testers + +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "geos"; + version = "3.11.2"; + + src = fetchurl { + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + hash = "sha256-sfB3ZpSBxaPmKv/EnpbrBvKBmHpdNv2rIlIX5bgl5Mw="; + }; + + patches = [ + # Pull upstream fix of `gcc-13` build failure: + # https://github.com/libgeos/geos/pull/805 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1.patch"; + hash = "sha256-dQT3Hf9YJchgjon/r46TLIXXbE6C0ZnewyvfYJea4jM="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + geos = callPackage ./tests.nix { geos = finalAttrs.finalPackage; }; + }; + + meta = with lib; { + description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software"; + homepage = "https://libgeos.org"; + license = licenses.lgpl21Only; + maintainers = teams.geospatial.members; + pkgConfigModules = [ "geos" ]; + mainProgram = "geosop"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91172ebdabf2..386a6d6d6116 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21455,6 +21455,8 @@ with pkgs; geos39 = callPackage ../development/libraries/geos/3.9.nix { }; + geos311 = callPackage ../development/libraries/geos/3.11.nix { }; + getdata = callPackage ../development/libraries/getdata { }; inherit (callPackages ../development/libraries/getdns { })