Skip to content
This repository has been archived by the owner on Nov 27, 2024. It is now read-only.

Commit

Permalink
Merge pull request #498 from imincik/weekly-update-2024.25
Browse files Browse the repository at this point in the history
pkgs: weekly update (weekly-update-2024.25)
  • Loading branch information
imincik authored Jun 21, 2024
2 parents d80fde3 + f9f3854 commit ff7e5b9
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 323 deletions.
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 1 addition & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,8 @@
inherit geos libgeotiff libspatialite proj tiledb;
useMinimalFeatures = true;
};
gdal_3_9 = pkgs.callPackage ./pkgs/gdal/3.9.nix {
inherit geos libgeotiff libspatialite proj tiledb;
useJava = false;
};
gdal-master = (pkgs.callPackage ./pkgs/gdal/master.nix {
# inherit gdal;
gdal = gdal_3_9; # TODO: replace with default gdal version
inherit gdal;
}).master;
_gdal = gdal;

Expand Down Expand Up @@ -299,7 +294,6 @@
# Core libs
gdal
gdal-minimal
gdal_3_9
gdal-master
geos
libgeotiff
Expand Down
286 changes: 0 additions & 286 deletions pkgs/gdal/3.9.nix

This file was deleted.

14 changes: 7 additions & 7 deletions pkgs/gdal/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,20 @@

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
# HDF5: add support for libhdf5 >= 1.14.4.2 when built with Float16
(fetchpatch {
url = "https://github.com/OSGeo/gdal/commit/ca2eb4130750b0e6365f738a5f8ff77081f5c5bb.patch";
sha256 = "sha256-wShYm9yA7twJR72co+Tvf/IuYXqbI0OrjWl0uqC3bwo=";
url = "https://github.com/OSGeo/gdal/commit/16ade8253f26200246abb5ab24d17e18216e7a11.patch";
sha256 = "sha256-N6YqfcOUWeaJXVE9RUo1dzulxqIY5Q/UygPnZHau3Lc=";
})
];

Expand Down Expand Up @@ -229,8 +229,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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/gdal/master-rev.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
rev = "064ea59";
hash = "sha256-MqZ9+xn6m22wFpVg8NmSqavCOboXvXdkU4G3K53fBEY=";
rev = "a49c3d1";
hash = "sha256-6glRv+Xtz5naR+rSkBE9q4K9NoOYMajWM7j5g7rjhRM=";
}
15 changes: 15 additions & 0 deletions pkgs/geopandas/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
stdenv,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
pytestCheckHook,
pythonOlder,
setuptools,
Expand All @@ -29,6 +30,20 @@ buildPythonPackage rec {
hash = "sha256-FBhPcae8bnNnsfr14I1p22VhoOf9USF9DAcrAqx+zso=";
};

patches = [
# GDAL 3.9 compat for boolean array in shp
(fetchpatch {
url = "https://github.com/geopandas/geopandas/commit/f1be60532bed31cb410ce4db2da6b733bc8713c9.patch";
sha256 = "sha256-DZhC7sSOki0XTcojSRvVVSlsnYnxCw/Ee7vHBmDCsbA=";
})

# GDAL 3.9 compat for boolean array in shp for fiona
(fetchpatch {
url = "https://github.com/geopandas/geopandas/commit/1e08422d8aee4877752047a8a08f41e3a67188f2.patch";
sha256 = "sha256-SpNqe7jL1rA79YhhSUfEzt30plt56Tux5v1h7IHp31I=";
})
];

build-system = [ setuptools ];

propagatedBuildInputs = [
Expand Down
Loading

0 comments on commit ff7e5b9

Please sign in to comment.