diff options
| author | Robert Schütz <nix@dotlambda.de> | 2022-11-17 20:28:29 -0800 |
|---|---|---|
| committer | Robert Schütz <github@dotlambda.de> | 2022-11-25 09:54:31 -0800 |
| commit | eb5ee0412dbe33dfb98121c1cff1786e75275257 (patch) | |
| tree | 7d20feeb520f81648e19a7cafb72a88a1f41dbcb | |
| parent | lerc: 3.0 -> 4.0.0 (diff) | |
| download | nixpkgs-eb5ee0412dbe33dfb98121c1cff1786e75275257.tar.gz | |
gdal: 3.5.2 -> 3.6.0.1
https://github.com/OSGeo/gdal/blob/v3.6.0.1/NEWS.md
(cherry picked from commit 50f24d3b9798d7e063df4d2a8178b88b3a9635c0)
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 382806005da1..731f458efea2 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , bison , cmake , doxygen @@ -61,15 +62,24 @@ stdenv.mkDerivation rec { pname = "gdal"; - version = "3.5.2"; + version = "3.6.0.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${version}"; - sha256 = "sha256-jtAFI1J64ZaTqIljqQL1xOiTGC79AZWcIgidozWczMM="; + hash = "sha256-Yx7tmj2Y26FE5rzN+w1gg/7yRckNo6gLudrAPRoCro4="; }; + patches = [ + # https://github.com/OSGeo/gdal/pull/6754 + (fetchpatch { + name = "skip-test-failing-on-macos.patch"; + url = "https://github.com/OSGeo/gdal/commit/65b2b12fa6638653f54d3ca0f8066225597832b9.patch"; + hash = "sha256-zpj4jMp01Oz+Zk1b59qdoVxhkwWmTN9bwoKwbau2ADY="; + }) + ]; + nativeBuildInputs = [ bison cmake |