about summary refs log tree commit diff
path: root/pkgs/development/libraries/gdal
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-03-15 12:25:41 +0000
committerGitHub <noreply@github.com>2021-03-15 12:25:41 +0000
commitdec95bae4a3fce008fab10836f4d5d0c43baf9cf (patch)
tree16731a63595b0bc89248e37aca1f34b5ae00a3de /pkgs/development/libraries/gdal
parente7b44e6f52f520518472b5b186d32694aee90ce6 (diff)
parent22a56ecc930d113443894ddbd89a12e9b3524f46 (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/gdal')
-rw-r--r--pkgs/development/libraries/gdal/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index edd3971c1f58d..15fc84895fb57 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -7,14 +7,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "gdal";
-  # broken with poppler 20.08, however, can't fetch patches cleanly
-  version = "3.1.2.post2020-08-26";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "gdal";
-    rev = "9a8df672204a8b3b33c36e09a32f747e21166fe9";
-    sha256 = "1n25jma4x1l7slwxk702q77r84vxr90fyn4c3zpkr07q1b8wqql9";
+    rev = "a33784291d19015217ea2604988e53d448e14a07";
+    sha256 = "sha256-ynCju3chDfYtyrGmUE0n3kkaH2Mpm+/DDHHxCahjhSQ=";
   };
 
   sourceRoot = "source/gdal";