From 61b477f6726e915b19b33e445d20f33ff8a2b743 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 16 Sep 2025 04:10:10 +0100 Subject: [PATCH] proj_7: drop --- pkgs/development/libraries/proj/7.nix | 76 ------------------- .../libraries/proj/tests-sqlite-3.39.patch | 13 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 pkgs/development/libraries/proj/7.nix delete mode 100644 pkgs/development/libraries/proj/tests-sqlite-3.39.patch diff --git a/pkgs/development/libraries/proj/7.nix b/pkgs/development/libraries/proj/7.nix deleted file mode 100644 index 58b54feee0bf..000000000000 --- a/pkgs/development/libraries/proj/7.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - sqlite, - libtiff, - curl, - gtest, - fetchpatch, -}: - -stdenv.mkDerivation rec { - pname = "proj"; - version = "7.2.1"; - - src = fetchFromGitHub { - owner = "OSGeo"; - repo = "PROJ"; - rev = version; - sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9"; - }; - - patches = [ - (fetchpatch { - # https://github.com/OSGeo/PROJ/issues/2557 - name = "gie_self_tests-fail.diff"; # included in >= 8.0.1 - url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff"; - sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf"; - }) - ./tests-sqlite-3.39.patch - ]; - - postPatch = lib.optionalString (version == "7.2.1") '' - substituteInPlace CMakeLists.txt \ - --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1" - ''; - - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - sqlite - libtiff - curl - ]; - - nativeCheckInputs = [ gtest ]; - - cmakeFlags = [ - "-DUSE_EXTERNAL_GTEST=ON" - ]; - CXXFLAGS = [ - # GCC 13: error: 'int64_t' in namespace 'std' does not name a type - "-include cstdint" - ]; - - doCheck = true; - - meta = with lib; { - broken = true; # undefined reference to `TIFFReadEncodedStrip' - description = "Cartographic Projections Library"; - homepage = "https://proj4.org"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/libraries/proj/tests-sqlite-3.39.patch b/pkgs/development/libraries/proj/tests-sqlite-3.39.patch deleted file mode 100644 index 0654ff5eadb6..000000000000 --- a/pkgs/development/libraries/proj/tests-sqlite-3.39.patch +++ /dev/null @@ -1,13 +0,0 @@ -Drop tests that time out with newest sqlite. -https://github.com/OSGeo/PROJ/issues/3254 - ---- a/test/cli/CMakeLists.txt -+++ b/test/cli/CMakeLists.txt -@@ -16 +15,0 @@ --proj_add_test_script_sh("testprojinfo" PROJINFO_BIN) ---- a/test/unit/CMakeLists.txt -+++ b/test/unit/CMakeLists.txt -@@ -144,3 +143,0 @@ --add_test(NAME proj_test_cpp_api COMMAND proj_test_cpp_api) --set_property(TEST proj_test_cpp_api -- PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ebf5268a7f39..de21703fc4b1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2069,6 +2069,7 @@ mapAliases { private-gpt = throw "'private-gpt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2025-07-28 probe-rs = probe-rs-tools; # Added 2024-05-23 probe-run = throw "probe-run is deprecated upstream. Use probe-rs instead."; # Added 2024-05-23 + proj_7 = throw "proj_7 has been removed, as it was broken and unused"; # Added 2025-09-16 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10 prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e60748213ea..e1e0bed5e8a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8641,8 +8641,6 @@ with pkgs; proj = callPackage ../development/libraries/proj { }; - proj_7 = callPackage ../development/libraries/proj/7.nix { }; - prospector = callPackage ../development/tools/prospector { }; protobuf = protobuf_32;