ajout paquet

geos.nix

@@ -0,0 +1,28 @@
+with import <nixpkgs> {};
+#{ composableDerivation, fetchurl, python }:
+
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} rec {
+
+  flags =
+  # python and ruby untested 
+    edf { name = "python"; enable = { buildInputs = [ python ]; }; };
+    # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else [])
+    # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };}
+
+  name = "geos-3.6.1";
+
+  src = fetchurl {
+    url = "http://download.osgeo.org/geos/${name}.tar.bz2";
+    sha256 = "1icz31kd5sml2kdxhjznvmv33zfr6nig9l0i6bdcz9q9g8x4wbja";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "C++ port of the Java Topology Suite (JTS)";
+    homepage = http://geos.refractions.net/;
+    license = "GPL";
+  };
+}

osm2pgsql.nix

@@ -4,9 +4,11 @@ stdenv.mkDerivation rec {
   version = "0.92.0";
   name = "osm2pgsql-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/openstreetmap/osm2pgsql/archive/${version}.tar.gz";
-    sha256 = "0xzfcghl6nycixaajz6sblb57nlcidasjx8zfbpmvzc9ckgwyhdp";
+  src = fetchFromGitHub {
+    owner = "openstreetmap";
+    repo = "osm2pgsql";
+    rev = version;
+    sha256 = "1wf3xd33glf4kf34yx7ljwzmn24iar1rb0zqf8m2qclqs169f8dz";
   };
 
   #nativeBuildInputs = [ ];
@@ -15,7 +17,8 @@ stdenv.mkDerivation rec {
     bzip2
     cmake
     expat
-      geos
+    #geos
+    r6d.geos
     #libressl    # TLS, crypto implementation
     lua
     openssl     # TLS, crypto implementation

release.nix

@@ -28,6 +28,9 @@ with (import <nixpkgs/pkgs/top-level/release-lib.nix> { inherit supportedSystems
   teleragno.www.MASTER = import ./github-teleragno-www-MASTER.nix;
 
   midpix.slibtool = import ./midipix.nix;
+
+  r6d.geos = import ./geos.nix
+  r6d.osm2pgsql = import ./osm2pgsql.nix
 } /*  // {
   # Simply assign a derivation to an attribute to have it built.
   hello_world_1 = pkgs_x86_64_linux.hello;