swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 05:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #108813 from sikmir/osmium

Browse source
This commit is contained in:
Sandro 2021-01-09 17:46:26 +01:00 committed by GitHub
parent b24abe6c3b 00a23bd1b3
commit 5ec6c8e718
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/misc/osmium-tool/default.nix
View file

@ -7,19 +7,20 @@
, bzip2 , bzip2
, expat , expat
, libosmium , libosmium
, lz4
, protozero , protozero
, zlib , zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "osmium-tool"; pname = "osmium-tool";
version = "1.12.1"; version = "1.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "osmcode"; owner = "osmcode";
repo = "osmium-tool"; repo = "osmium-tool";
rev = "v${version}"; rev = "v${version}";
sha256 = "13142hj8gfgj6w51a62hjzfmzic90xgrnnlnb70hpdqjy86bxv7j"; sha256 = "0rn67g4xf01i7pkxrdh87jdj2rzkw5pfkx5wkg9245z5yxjxhqj2";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
bzip2 bzip2
expat expat
libosmium libosmium
lz4
protozero protozero
zlib zlib
]; ];
@ -46,7 +48,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Multipurpose command line tool for working with OpenStreetMap data based on the Osmium library"; description = "Multipurpose command line tool for working with OpenStreetMap data based on the Osmium library";
homepage = "https://osmcode.org/osmium-tool/"; homepage = "https://osmcode.org/osmium-tool/";
license = with licenses; [ gpl3 mit bsd3 ]; license = with licenses; [ gpl3Plus mit bsd3 ];
maintainers = with maintainers; [ das-g ]; maintainers = with maintainers; [ das-g ];
}; };
} }

6
pkgs/development/libraries/libosmium/default.nix
View file

@ -2,19 +2,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libosmium"; pname = "libosmium";
version = "2.15.6"; version = "2.16.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "osmcode"; owner = "osmcode";
repo = "libosmium"; repo = "libosmium";
rev = "v${version}"; rev = "v${version}";
sha256 = "0rqy18bbakp41f44y5id9ixh0ar2dby46z17p4115z8k1vv9znq2"; sha256 = "1na51g6xfm1bx0d0izbg99cwmqn0grp0g41znn93xnhs202qnb2h";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ protozero zlib bzip2 expat boost ]; buildInputs = [ protozero zlib bzip2 expat boost ];
cmakeFlags = [ "-DINSTALL_GDALCPP:BOOL=ON" ];
doCheck = true; doCheck = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/development/python-modules/pyosmium/default.nix
View file

@ -4,7 +4,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyosmium"; pname = "pyosmium";
version = "3.0.1"; version = "3.1.0";
disabled = pythonOlder "3.4" || isPyPy; disabled = pythonOlder "3.4" || isPyPy;
@ -12,7 +12,7 @@ buildPythonPackage rec {
owner = "osmcode"; owner = "osmcode";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "06jngbmmmswhyi5q5bjph6gwss28d2azn5414zf0arik5bcvz128"; sha256 = "0m11hdgiysdhyi5yn6nj8a8ycjzx5hpjy7n1c4j6q5caifj7rf7h";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];