diff options
| author | Ivan Mincik <ivan.mincik@gmail.com> | 2024-05-13 12:02:50 +0200 |
|---|---|---|
| committer | Ivan Mincik <ivan.mincik@gmail.com> | 2024-06-12 11:05:19 +0200 |
| commit | 06c9d396bdabc505c53e5ad0d336cf8fa35c7155 (patch) | |
| tree | 6bca7972b8a34368d0e437b599f078907c3778cb /pkgs/development/libraries/gdal/default.nix | |
| parent | 2e92235aa591abc613504fde2546d6f78b18c0cd (diff) | |
gdal: 3.8.5 -> 3.9.0
Diffstat (limited to 'pkgs/development/libraries/gdal/default.nix')
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index e7a9994888275..35875c8aef759 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -2,7 +2,6 @@ , stdenv , callPackage , fetchFromGitHub -, fetchpatch , useMinimalFeatures ? false , useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) @@ -80,23 +79,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.8.5"; + version = "3.9.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-Z+mYlyOX9vJ772qwZMQfCbD/V7RL6+9JLHTzoZ55ot0="; + hash = "sha256-xEekgF9GzsPYkwk7Nny9b1DMLTxBqTSdudYxaz4jl/c="; }; - patches = [ - # bump java source option to fix build with JDK 21 - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/ca2eb4130750b0e6365f738a5f8ff77081f5c5bb.patch"; - sha256 = "sha256-wShYm9yA7twJR72co+Tvf/IuYXqbI0OrjWl0uqC3bwo="; - }) - ]; - nativeBuildInputs = [ bison cmake @@ -229,8 +220,8 @@ stdenv.mkDerivation (finalAttrs: { export GDAL_DOWNLOAD_TEST_DATA=OFF # allows to skip tests that fail because of file handle leak # the issue was not investigated - # https://github.com/OSGeo/gdal/blob/v3.7.0/autotest/gdrivers/bag.py#L61 - export BUILD_NAME=fedora + # https://github.com/OSGeo/gdal/blob/v3.9.0/autotest/gdrivers/bag.py#L54 + export CI=1 ''; nativeInstallCheckInputs = with python3.pkgs; [ pytestCheckHook |