From 1c306ed6f5bc56e66707e9250825586a97fb200d Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 29 Nov 2024 22:22:29 +0100 Subject: [PATCH] geos: remove 3.11 version The last package using it was python3Packages.shapely_1_8, removed in 5c493ae9edbc. So we can finally drop this package. --- pkgs/development/libraries/geos/3.11.nix | 52 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 54 deletions(-) delete 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 deleted file mode 100644 index 32e1f39965d7..000000000000 --- a/pkgs/development/libraries/geos/3.11.nix +++ /dev/null @@ -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"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 56a4fcbcd822..fb65e4d71181 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -423,6 +423,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b6419813241..097db64bb509 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9222,8 +9222,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;