diff options
author | Robert Scott <code@humanleg.org.uk> | 2022-01-19 19:11:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-19 19:11:07 +0000 |
commit | 2a13b8ef6e7c85204d655b536268979e30ae46a7 (patch) | |
tree | c99d6d96a7e60cf1d49f9adb4a17a4e18977ba9f /pkgs/development/libraries/gdal | |
parent | a11d9fcd1f86c7ce1c1f8a25c3bb51789f56ff55 (diff) | |
parent | 367ef7e81fc1e92572c59cc077cee07c1369fc4d (diff) | |
download | nixpkgs-2a13b8ef6e7c85204d655b536268979e30ae46a7.tar nixpkgs-2a13b8ef6e7c85204d655b536268979e30ae46a7.tar.gz nixpkgs-2a13b8ef6e7c85204d655b536268979e30ae46a7.tar.bz2 nixpkgs-2a13b8ef6e7c85204d655b536268979e30ae46a7.tar.lz nixpkgs-2a13b8ef6e7c85204d655b536268979e30ae46a7.tar.xz nixpkgs-2a13b8ef6e7c85204d655b536268979e30ae46a7.tar.zst nixpkgs-2a13b8ef6e7c85204d655b536268979e30ae46a7.zip |
Merge pull request #154037 from risicle/ris-gdal-3.4.1
gdal: 3.3.2 -> 3.4.1, t-rex: 0.14.2 -> 0.14.3-beta4
Diffstat (limited to 'pkgs/development/libraries/gdal')
-rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 62735dfa9b0..124c0a48cde 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.3.2"; + version = "3.4.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${version}"; - sha256 = "sha256-fla3EMDmuW0+vmmU0sgtLsGfO7dDApLQ2EoKJeR/1IM="; + sha256 = "11rjdaxmsp9n3r9xhmgd7ksy8bh5fazwsxdj0xvl4hsy6bcn4n97"; }; sourceRoot = "source/gdal"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { expat libxml2 postgresql - ] ++ (with pythonPackages; [ python numpy wrapPython ]) + ] ++ (with pythonPackages; [ python setuptools numpy wrapPython ]) ++ lib.optional stdenv.isDarwin libiconv ++ lib.optionals netcdfSupport [ netcdf hdf5 curl ]; |