From 6516bf4dd0f3a02658414a8926ca3f67b91b401f Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Wed, 17 Sep 2014 07:48:34 +0200
Subject: [PATCH 1/3] new 'gis' hierachy and initial saga expression

---
 .../{misc => gis}/qgis/default.nix            |  0
 pkgs/applications/gis/saga/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++-
 3 files changed, 26 insertions(+), 1 deletion(-)
 rename pkgs/applications/{misc => gis}/qgis/default.nix (100%)
 create mode 100644 pkgs/applications/gis/saga/default.nix

diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
similarity index 100%
rename from pkgs/applications/misc/qgis/default.nix
rename to pkgs/applications/gis/qgis/default.nix
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
new file mode 100644
index 00000000000..cdfdeece48a
--- /dev/null
+++ b/pkgs/applications/gis/saga/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gdal, wxGTK30, proj, libharu, opencv, vigra
+  }:
+
+stdenv.mkDerivation rec {
+  name = "saga-2.1.2";
+
+  buildInputs = [ gdal wxGTK30 proj libharu opencv vigra ];
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.2/saga_2.1.2.tar.gz";
+    sha256 = "51885446f717191210c4b13f0c35a1c5194c9d696d4f9b8f594bc1014809b2f5";
+
+  };
+
+  meta = {
+    description = "SAGA - System for Automated Geoscientific Analyses";
+    homepage = http://www.saga-gis.org;
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dffb37bf466..d40470d81d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10593,7 +10593,7 @@ let
 
   inherit (gnome3) yelp;
 
-  qgis = callPackage ../applications/misc/qgis {};
+  qgis = callPackage ../applications/gis/qgis {};
 
   qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
 
@@ -10843,6 +10843,8 @@ let
 
   rogue = callPackage ../games/rogue { };
 
+  saga = callPackage ../applications/gis/saga { };
+
   samplv1 = callPackage ../applications/audio/samplv1 { };
 
   sauerbraten = callPackage ../games/sauerbraten {};

From 5d166bb8d5a09b0b1e103482307792806aaaa421 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Mon, 22 Sep 2014 13:54:24 +0200
Subject: [PATCH 2/3] saga: Compiling with all dependencies

---
 pkgs/applications/gis/saga/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index cdfdeece48a..9a2fa3c6e84 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, fetchurl, gdal, wxGTK30, proj, libharu, opencv, vigra
-  }:
+{ stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, jasper,
+  libharu, opencv, vigra, postgresql}:
 
 stdenv.mkDerivation rec {
   name = "saga-2.1.2";
 
-  buildInputs = [ gdal wxGTK30 proj libharu opencv vigra ];
+  buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper];
 
   enableParallelBuilding = true;
 
   src = fetchurl {
     url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.2/saga_2.1.2.tar.gz";
     sha256 = "51885446f717191210c4b13f0c35a1c5194c9d696d4f9b8f594bc1014809b2f5";
-
   };
 
   meta = {

From 1aa3951099129b2e6bab6bb2db4f8da82af05ba2 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Mon, 22 Sep 2014 13:59:28 +0200
Subject: [PATCH 3/3] saga: adding me as maintainer

---
 pkgs/applications/gis/saga/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 9a2fa3c6e84..45cac213321 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     description = "SAGA - System for Automated Geoscientific Analyses";
     homepage = http://www.saga-gis.org;
     license = stdenv.lib.licenses.gpl2Plus;
+    maintainer = stdenv.lib.maintainers.michelk;
     platforms = with stdenv.lib.platforms; linux;
   };
 }