about summary refs log tree commit diff
path: root/pkgs/applications/misc/osmctools
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2016-10-13 12:33:48 +0000
committerJan Malakhovski <oxij@oxij.org>2017-03-05 14:12:11 +0000
commit6abb141a644d6e61eecadd138e0ce615a26e43b5 (patch)
tree929a5b44008f0fd8da72c31a60c534f6ef253cb2 /pkgs/applications/misc/osmctools
parent4da420709d1408addd0cfd1406c18e7ec3d1d941 (diff)
downloadnixlib-6abb141a644d6e61eecadd138e0ce615a26e43b5.tar
nixlib-6abb141a644d6e61eecadd138e0ce615a26e43b5.tar.gz
nixlib-6abb141a644d6e61eecadd138e0ce615a26e43b5.tar.bz2
nixlib-6abb141a644d6e61eecadd138e0ce615a26e43b5.tar.lz
nixlib-6abb141a644d6e61eecadd138e0ce615a26e43b5.tar.xz
nixlib-6abb141a644d6e61eecadd138e0ce615a26e43b5.tar.zst
nixlib-6abb141a644d6e61eecadd138e0ce615a26e43b5.zip
osmctools: osmfilter: init at 1.4.0
Diffstat (limited to 'pkgs/applications/misc/osmctools')
-rw-r--r--pkgs/applications/misc/osmctools/default.nix32
1 files changed, 24 insertions, 8 deletions
diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix
index bb4719639ab9..5a9ffc13007f 100644
--- a/pkgs/applications/misc/osmctools/default.nix
+++ b/pkgs/applications/misc/osmctools/default.nix
@@ -1,30 +1,46 @@
 { stdenv, fetchurl, zlib } :
 
-stdenv.mkDerivation rec {
-  name = "osmctools-${version}";
-  version = "0.8.5";
+let
 
-  src = fetchurl {
+  convert_src = fetchurl {
     url = http://m.m.i24.cc/osmconvert.c;
-    sha256 = "9da0940912d1bc62223b962483fd796f92c959c48749806aee5806164e5875d7";
+    sha256 = "1mvmb171c1jqxrm80jc7qicwk4kgg7yq694n7ci65g6i284r984x";
+    # version = 0.8.5
+  };
+
+  filter_src = fetchurl {
+    url = http://m.m.i24.cc/osmfilter.c;
+    sha256 = "0vm3bls9jb2cb5b11dn82sxnc22qzkf4ghmnkivycigrwa74i6xl";
+    # version = 1.4.0
   };
 
+in
+
+stdenv.mkDerivation rec {
+  name = "osmctools-${version}";
+  version = "0.8.5plus1.4.0";
+
   buildInputs = [ zlib ];
 
   phases = [ "buildPhase" "installPhase" ];
 
   buildPhase = ''
-    cc $src -lz -O3 -o osmconvert
+    cc ${convert_src} -lz -O3 -o osmconvert
+    cc ${filter_src} -O3 -o osmfilter
   '';
 
   installPhase = ''
     mkdir -p $out/bin
     mv osmconvert $out/bin
+    mv osmfilter $out/bin
   '';
 
   meta = with stdenv.lib; {
-    description = "Converter between various Open Street Map file formats";
-    homepage = http://wiki.openstreetmap.org/wiki/Osmconvert;
+    description = "Command line tools for transforming Open Street Map files";
+    homepage = ''
+      http://wiki.openstreetmap.org/wiki/Osmconvert
+      https://wiki.openstreetmap.org/wiki/Osmfilter
+    '';
     platforms = platforms.unix;
   };
 }