JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proj_7: drop tests that time out with newest sqlite

Browse Source 
This version is really being phased out,
so let's hope it's better somewhat working than not building.
This commit is contained in:
Vladimír Čunát 2022-07-07 22:21:43 +02:00
parent 7bf7571a34
commit f5adaf2ba8
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/proj/7.nix
View File

@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff"; url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";
sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf"; sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";
}) })
./tests-sqlite-3.39.patch
]; ];
postPatch = lib.optionalString (version == "7.2.1") '' postPatch = lib.optionalString (version == "7.2.1") ''

13
pkgs/development/libraries/proj/tests-sqlite-3.39.patch Normal file
View File

@ -0,0 +1,13 @@
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})