From a1cdfdcebac8853c124d32a46e873c9d58734c69 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Fri, 3 Mar 2017 19:34:03 +0100
Subject: [PATCH] osm2pgsql: version dev

---
 osm2pgsql/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/osm2pgsql/default.nix b/osm2pgsql/default.nix
index 66344e9..138c095 100644
--- a/osm2pgsql/default.nix
+++ b/osm2pgsql/default.nix
@@ -1,14 +1,16 @@
 with import <nixpkgs> {};
 
 stdenv.mkDerivation rec {
-  version = "0.92.0";
+  #version = "0.92.0";
+  version = "2017-03-03";
   name = "osm2pgsql-${version}";
 
   src = fetchFromGitHub {
     owner = "openstreetmap";
     repo = "osm2pgsql";
-    rev = version;
-    sha256 = "1wf3xd33glf4kf34yx7ljwzmn24iar1rb0zqf8m2qclqs169f8dz";
+    #rev = "master";
+    rev = "c49d1b91aa559444f79280d5cef206d0541c9859";
+    sha256 = "0wn0bm4ghp5rpm8avwp3j9f36l1lgl2v245v5smqfqxgarjvsbvk";
   };
 
   # https://github.com/openstreetmap/osm2pgsql/issues/634
@@ -23,7 +25,6 @@ stdenv.mkDerivation rec {
     bzip2
     cmake
     expat
-    geos
     #libressl    # TLS, crypto implementation
     lua
     openssl     # TLS, crypto implementation
@@ -42,10 +43,8 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://wiki.openstreetmap.org/wiki/Osm2pgsql;
     description = "osm2pgsql is a tool for loading OpenStreetMap data into a PostgreSQL / PostGIS database suitable for applications like rendering into a map, geocoding with Nominatim, or general analysis.";
-    #license = licenses.gpl2;
-    #maintainers = [ maintainers.phunehehe ];
-    maintainers = [ "Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>" ];
-    #maintainers = [ maintainers.jpierre03 ];
+    license = licenses.gpl2;
+    maintainers = [ maintainers.jpierre03 ];
   };
 }