Merge pull request #108354 from Thra11/osmscout-server

authored by Sandro and committed by GitHub 642f28a1 588e7caf

+189
+65
pkgs/applications/misc/osmscout-server/default.nix
··· 1 + { lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config 2 + , qmake, qttools, kirigami2, qtquickcontrols2, qtlocation 3 + , libosmscout, mapnik, valhalla, libpostal, osrm-backend, protobuf 4 + , libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost 5 + }: 6 + 7 + let 8 + date = fetchFromGitHub { 9 + owner = "HowardHinnant"; 10 + repo = "date"; 11 + rev = "a2fdba1adcb076bf9a8343c07524afdf09aa8dcc"; 12 + sha256 = "00sf1pbaz0g0gsa0dlm23lxk4h46xm1jv1gzbjj5rr9sf1qccyr5"; 13 + }; 14 + in 15 + mkDerivation rec { 16 + pname = "osmscout-server"; 17 + version = "1.17.1"; 18 + 19 + src = fetchFromGitHub { 20 + owner = "rinigus"; 21 + repo = "osmscout-server"; 22 + rev = version; 23 + sha256 = "0rpsi6nyhcz6bv0jab4vixkxhjmn84xi0q2xz15a097hn46cklx9"; 24 + fetchSubmodules = true; 25 + }; 26 + 27 + # Two patches required to work with valhalla 3.1 28 + patches = [ 29 + # require C++14 to match latest Valhalla 30 + (fetchpatch { 31 + url = "https://github.com/rinigus/osmscout-server/commit/78b41b9b4c607fe9bfd6fbd61ae31cb7c8a725cd.patch"; 32 + sha256 = "0gk9mdwa75awl0bj30gm8waj454d8k2yixxwh05m0p550cbv3lg0"; 33 + }) 34 + # add Valhalla 3.1 config 35 + (fetchpatch { 36 + url = "https://github.com/rinigus/osmscout-server/commit/584de8bd47700053960fa139a2d7f8d3d184c876.patch"; 37 + sha256 = "0liz72n83q93bzzyyiqjkxa6hp9zjx7v9rgsmpwf88gc4caqm2dz"; 38 + }) 39 + ]; 40 + 41 + nativeBuildInputs = [ qmake pkg-config qttools ]; 42 + buildInputs = [ 43 + kirigami2 qtquickcontrols2 qtlocation 44 + mapnik valhalla libosmscout osrm-backend libmicrohttpd_0_9_70 45 + libpostal sqlite marisa kyotocabinet boost protobuf date 46 + ]; 47 + 48 + # OSMScout server currently defaults to an earlier version of valhalla, 49 + # but valhalla 3.1 support has been added. (See patches above) 50 + # Replace the default valhalla.json with the valhalla 3.1 version 51 + postPatch = '' 52 + mv data/valhalla.json-3.1 data/valhalla.json 53 + ''; 54 + 55 + # Choose to build the kirigami UI variant 56 + qmakeFlags = [ "SCOUT_FLAVOR=kirigami" ]; 57 + 58 + meta = with lib; { 59 + description = "Maps server providing tiles, geocoder, and router"; 60 + homepage = "https://github.com/rinigus/osmscout-server"; 61 + license = licenses.gpl3Only; 62 + maintainers = [ maintainers.Thra11 ]; 63 + platforms = platforms.linux; 64 + }; 65 + }
+24
pkgs/development/libraries/libosmscout/default.nix
··· 1 + { lib, mkDerivation, fetchgit, cmake, pkg-config 2 + , marisa, qtlocation }: 3 + 4 + mkDerivation rec { 5 + pname = "libosmscout"; 6 + version = "2017.06.30"; 7 + 8 + src = fetchgit { 9 + url = "git://git.code.sf.net/p/libosmscout/code"; 10 + rev = "0c0fde4d9803539c99911389bc918377a93f350c"; 11 + sha256 = "1pa459h52kw88mvsdvkz83f4p35vvgsfy2qfjwcj61gj4y9d2rq4"; 12 + }; 13 + 14 + nativeBuildInputs = [ cmake pkg-config ]; 15 + buildInputs = [ marisa qtlocation ]; 16 + 17 + meta = with lib; { 18 + description = "Simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data"; 19 + homepage = "http://libosmscout.sourceforge.net/"; 20 + license = licenses.lgpl3Plus; 21 + maintainers = [ maintainers.Thra11 ]; 22 + platforms = platforms.linux; 23 + }; 24 + }
+27
pkgs/development/libraries/libpostal/default.nix
··· 1 + { lib, stdenv, fetchFromGitHub, autoreconfHook }: 2 + 3 + stdenv.mkDerivation rec { 4 + pname = "libpostal"; 5 + version = "1.0.0"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "openvenues"; 9 + repo = "libpostal"; 10 + rev = "v${version}"; 11 + sha256 = "0qf5nkfkfjl2ylkrnw7kzax71y85gkr8i24glyp9rflyzmpj6giy"; 12 + }; 13 + 14 + nativeBuildInputs = [ autoreconfHook ]; 15 + 16 + configureFlags = [ 17 + "--disable-data-download" 18 + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--disable-sse2" ]; 19 + 20 + meta = with lib; { 21 + description = "A C library for parsing/normalizing street addresses around the world. Powered by statistical NLP and open geo data"; 22 + homepage = "https://github.com/openvenues/libpostal"; 23 + license = licenses.mit; 24 + maintainers = [ maintainers.Thra11 ]; 25 + platforms = platforms.linux; 26 + }; 27 + }
+26
pkgs/development/libraries/prime-server/default.nix
··· 1 + { lib, stdenv, fetchFromGitHub, cmake, pkg-config 2 + , curl, zeromq, czmq, libsodium }: 3 + 4 + stdenv.mkDerivation rec { 5 + pname = "prime-server"; 6 + version = "0.6.7"; 7 + 8 + src = fetchFromGitHub { 9 + owner = "kevinkreiser"; 10 + repo = "prime_server"; 11 + rev = version; 12 + sha256 = "027w3cqfnciyy2x78hfclpb77askn773fab37mzwf6r3mcc7vyl5"; 13 + fetchSubmodules = true; 14 + }; 15 + 16 + nativeBuildInputs = [ cmake pkg-config ]; 17 + buildInputs = [ curl zeromq czmq libsodium ]; 18 + 19 + meta = with lib; { 20 + description = "Non-blocking (web)server API for distributed computing and SOA based on zeromq"; 21 + homepage = "https://github.com/kevinkreiser/prime_server"; 22 + license = licenses.bsd2; 23 + maintainers = [ maintainers.Thra11 ]; 24 + platforms = platforms.linux; 25 + }; 26 + }
+35
pkgs/development/libraries/valhalla/default.nix
··· 1 + { lib, stdenv, fetchFromGitHub, cmake, pkg-config 2 + , zlib, curl, protobuf, prime-server, boost, sqlite, libspatialite 3 + , luajit, geos, python3, zeromq }: 4 + 5 + stdenv.mkDerivation rec { 6 + pname = "valhalla"; 7 + version = "3.1.0"; 8 + 9 + src = fetchFromGitHub { 10 + owner = "valhalla"; 11 + repo = "valhalla"; 12 + rev = version; 13 + sha256 = "04vxvzy6hnhdvb9lh1p5vqzzi2drv0g4l2gnbdp44glipbzgd4dr"; 14 + fetchSubmodules = true; 15 + }; 16 + 17 + nativeBuildInputs = [ cmake pkg-config ]; 18 + buildInputs = [ 19 + zlib curl protobuf prime-server boost sqlite libspatialite 20 + luajit geos python3 zeromq 21 + ]; 22 + 23 + cmakeFlags = [ 24 + "-DENABLE_TESTS=OFF" 25 + "-DENABLE_BENCHMARKS=OFF" 26 + ]; 27 + 28 + meta = with lib; { 29 + description = "Open Source Routing Engine for OpenStreetMap"; 30 + homepage = "https://valhalla.readthedocs.io/"; 31 + license = licenses.mit; 32 + maintainers = [ maintainers.Thra11 ]; 33 + platforms = platforms.linux; 34 + }; 35 + }
+12
pkgs/top-level/all-packages.nix
··· 15572 15572 15573 15573 libosmocore = callPackage ../applications/misc/libosmocore { }; 15574 15574 15575 + libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { }; 15576 + 15575 15577 libotr = callPackage ../development/libraries/libotr { }; 15576 15578 15577 15579 libow = callPackage ../development/libraries/libow { }; ··· 15597 15599 libpng = callPackage ../development/libraries/libpng { }; 15598 15600 libpng_apng = libpng.override { apngSupport = true; }; 15599 15601 libpng12 = callPackage ../development/libraries/libpng/12.nix { }; 15602 + 15603 + libpostal = callPackage ../development/libraries/libpostal { }; 15600 15604 15601 15605 libpaper = callPackage ../development/libraries/libpaper { }; 15602 15606 ··· 16492 16496 16493 16497 portmidi = callPackage ../development/libraries/portmidi {}; 16494 16498 16499 + prime-server = callPackage ../development/libraries/prime-server { }; 16500 + 16495 16501 primesieve = callPackage ../development/libraries/science/math/primesieve { }; 16496 16502 16497 16503 prison = callPackage ../development/libraries/prison { }; ··· 17323 17329 vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; 17324 17330 17325 17331 vale = callPackage ../tools/text/vale { }; 17332 + 17333 + valhalla = callPackage ../development/libraries/valhalla { 17334 + boost = boost.override { enablePython = true; python = python38; }; 17335 + }; 17326 17336 17327 17337 vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { }; 17328 17338 ··· 24480 24490 orpie = callPackage ../applications/misc/orpie { }; 24481 24491 24482 24492 osmo = callPackage ../applications/office/osmo { }; 24493 + 24494 + osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { }; 24483 24495 24484 24496 palemoon = callPackage ../applications/networking/browsers/palemoon { 24485 24497 # https://developer.palemoon.org/build/linux/