From 0c22975cb2e8a6e1ad694ebc3d855def92042aad Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Mon, 23 Feb 2015 11:29:14 +0100
Subject: [PATCH 1/2] gdal: update to 1.11.2

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

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index b0feb2b6008..34b36aacfee 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -2,12 +2,12 @@
 , postgresql, mysql, libgeotiff, python, pythonPackages, proj}:
 
 composableDerivation.composableDerivation {} (fixed: rec {
-  version = "1.11.1";
+  version = "1.11.2";
   name = "gdal-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "0h1kib2pzv4nbppdnxv6vhngvk9ic531y8rzcwb8bg6am125jszl";
+    sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
   };
 
   buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj ];

From 3e87b82fe2eb1cff82789368952385416b3c83e4 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Tue, 24 Feb 2015 08:24:42 +0100
Subject: [PATCH 2/2] gdal: enabling geos

In order to use ogr2ogr for clipping, this options needs to be
enabled.
---
 pkgs/development/libraries/gdal/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 34b36aacfee..a59b526fee1 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
-, postgresql, mysql, libgeotiff, python, pythonPackages, proj}:
+, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos}:
 
 composableDerivation.composableDerivation {} (fixed: rec {
   version = "1.11.2";
@@ -26,6 +26,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
     "--with-geotiff=${libgeotiff}"
     "--with-python"               # optional
     "--with-static-proj4=${proj}" # optional
+    "--with-geos=${geos}/bin/geos-config"# optional
   ];
 
   meta = {