summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-01-09 17:46:26 +0100
committerGitHub <noreply@github.com>2021-01-09 17:46:26 +0100
commit5ec6c8e71813deb2c79dd88c8346c74c96f75679 (patch)
tree2be26200cc58f7ee7b79a4b6ea4018446b61bab9 /pkgs/applications/misc
parentb24abe6c3b1cd97be2708f84a38191411aa913cd (diff)
parent00a23bd1b3a42eb20078d9cbee467174f6872645 (diff)
downloadnixpkgs-5ec6c8e71813deb2c79dd88c8346c74c96f75679.tar
nixpkgs-5ec6c8e71813deb2c79dd88c8346c74c96f75679.tar.gz
nixpkgs-5ec6c8e71813deb2c79dd88c8346c74c96f75679.tar.bz2
nixpkgs-5ec6c8e71813deb2c79dd88c8346c74c96f75679.tar.lz
nixpkgs-5ec6c8e71813deb2c79dd88c8346c74c96f75679.tar.xz
nixpkgs-5ec6c8e71813deb2c79dd88c8346c74c96f75679.tar.zst
nixpkgs-5ec6c8e71813deb2c79dd88c8346c74c96f75679.zip
Merge pull request #108813 from sikmir/osmium
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/osmium-tool/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix
index 892038c252a..78878d79553 100644
--- a/pkgs/applications/misc/osmium-tool/default.nix
+++ b/pkgs/applications/misc/osmium-tool/default.nix
@@ -7,19 +7,20 @@
 , bzip2
 , expat
 , libosmium
+, lz4
 , protozero
 , zlib
 }:
 
 stdenv.mkDerivation rec {
   pname = "osmium-tool";
-  version = "1.12.1";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "osmcode";
     repo = "osmium-tool";
     rev = "v${version}";
-    sha256 = "13142hj8gfgj6w51a62hjzfmzic90xgrnnlnb70hpdqjy86bxv7j";
+    sha256 = "0rn67g4xf01i7pkxrdh87jdj2rzkw5pfkx5wkg9245z5yxjxhqj2";
   };
 
   nativeBuildInputs = [
@@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
     bzip2
     expat
     libosmium
+    lz4
     protozero
     zlib
   ];
@@ -46,7 +48,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Multipurpose command line tool for working with OpenStreetMap data based on the Osmium library";
     homepage = "https://osmcode.org/osmium-tool/";
-    license = with licenses; [ gpl3 mit bsd3 ];
+    license = with licenses; [ gpl3Plus mit bsd3 ];
     maintainers = with maintainers; [ das-g ];
   };
 }