proj_7: drop

This commit is contained in:
Emily
2025-09-16 04:15:32 +01:00
parent 5ec1665962
commit 61b477f672
4 changed files with 1 additions and 91 deletions
-76
View File
@@ -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 ];
};
}
@@ -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})
+1
View File
@@ -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
-2
View File
@@ -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;