From 6cf020fc29fa8a272e991e633e8372c424250e09 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Thu, 21 Jul 2016 08:17:44 +0200
Subject: gdal: 2.0.2 -> 2.1.1

---
 pkgs/development/libraries/gdal/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'pkgs/development/libraries/gdal')

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 36019bdd7f7..f19f760c748 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -6,24 +6,18 @@
  }:
 
 composableDerivation.composableDerivation {} (fixed: rec {
-  version = "2.0.2";
+  version = "2.1.1";
   name = "gdal-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4";
+    sha256 = "55fc6ffbe76e9d2e7e6cf637010e5d4bba6a966d065f40194ff798544198236b";
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl ]
   ++ (with pythonPackages; [ python numpy wrapPython ])
   ++ (stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]);
 
-  patches = [
-    # This ensures that the python package is installed into gdal's prefix,
-    # rather than trying to install into python's prefix.
-    ./python.patch
-  ];
-
   # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
   # Unset CC and CXX as they confuse libtool.
   preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
-- 
cgit 1.4.1