geos: remove 3.11 version, not needed any more (#360240)

This commit is contained in:
Aleksana
2024-12-08 12:16:42 +08:00
committed by GitHub
3 changed files with 1 additions and 54 deletions
-52
View File
@@ -1,52 +0,0 @@
{ lib
, stdenv
, callPackage
, fetchpatch
, fetchurl
, testers
, cmake
}:
stdenv.mkDerivation (finalAttrs: {
pname = "geos";
version = "3.11.4";
src = fetchurl {
url = "https://download.osgeo.org/geos/geos-${finalAttrs.version}.tar.bz2";
hash = "sha256-NkyIzPw4qlDPZccA57KuRwbtEDMmEoST2/dQx40TbSw=";
};
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 ];
# https://github.com/libgeos/geos/issues/930
cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
"-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope"
];
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";
};
})
+1
View File
@@ -427,6 +427,7 @@ mapAliases {
gcj = gcj6; # Added 2024-09-13
gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15
geos_3_11 = throw "geos_3_11 has been removed from nixpgks. Please use a more recent 'geos' instead.";
gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11
gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
-2
View File
@@ -9119,8 +9119,6 @@ with pkgs;
geos_3_9 = callPackage ../development/libraries/geos/3.9.nix { };
geos_3_11 = callPackage ../development/libraries/geos/3.11.nix { };
inherit (callPackages ../development/libraries/getdns { })
getdns stubby;