diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-10-19 14:40:23 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-01-07 10:22:32 +0000 |
commit | cc62bcb55359ba8c5e0fe3a48e778444c89060d8 (patch) | |
tree | ca0e21d44eaf8837b687395e614445f7761d7bbd /nixpkgs/pkgs/development/libraries/proj/default.nix | |
parent | d6625e8d25efd829c3cfa227d025ca4e606ae4b7 (diff) | |
parent | a323570a264da96a0b0bcc1c9aa017794acdc752 (diff) | |
download | nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.gz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.bz2 nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.lz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.xz nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.tar.zst nixlib-cc62bcb55359ba8c5e0fe3a48e778444c89060d8.zip |
Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/proj/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/proj/default.nix | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/development/libraries/proj/default.nix b/nixpkgs/pkgs/development/libraries/proj/default.nix index f22878ec8290..caa270bcf60f 100644 --- a/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -7,33 +7,19 @@ , libtiff , curl , gtest -, fetchpatch }: stdenv.mkDerivation rec { pname = "proj"; - version = "7.2.1"; + version = "8.1.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9"; + sha256 = "sha256-Z2nruyowC3NG4Wb8AFBL0PME/zp9D7SwQdMSl6VjH/w="; }; - 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"; - }) - ]; - - 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 ]; @@ -44,17 +30,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" + "-DRUN_NETWORK_DEPENDENT_TESTS=OFF" ]; - doCheck = stdenv.is64bit; - - preCheck = '' - export HOME=$TMPDIR - ''; + doCheck = true; meta = with lib; { description = "Cartographic Projections Library"; - homepage = "https://proj4.org"; + homepage = "https://proj.org/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ vbgl dotlambda ]; |