Merge pull request #30068 from mpickering/osm2xmap

libroxml: init at 2.3.0 and osm2xmap: init at 2.0 c1f7b68

authored by Graham Christensen and committed by GitHub 92b786a2 cff5eec3

+65 -1
+1
lib/maintainers.nix
··· 461 461 mounium = "Katona László <muoniurn@gmail.com>"; 462 462 MP2E = "Cray Elliott <MP2E@archlinux.us>"; 463 463 mpcsh = "Mark Cohen <m@mpc.sh>"; 464 + mpickering = "Matthew Pickering <matthewtpickering@gmail.com>"; 464 465 mpscholten = "Marc Scholten <marc@mpscholten.de>"; 465 466 mpsyco = "Francis St-Amour <fr.st-amour@gmail.com>"; 466 467 mrVanDalo = "Ingolf Wanger <contact@ingolf-wagner.de>";
+34
pkgs/applications/misc/osm2xmap/default.nix
··· 1 + { stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } : 2 + 3 + stdenv.mkDerivation rec { 4 + name = "osm2xmap-${version}"; 5 + version = "2.0"; 6 + 7 + src = fetchFromGitHub { 8 + sha256 = "1d3f18wzk240yp0q8i2vskhcfj5ar61s4hw83vgps0wr2aglph3w"; 9 + repo = "osm2xmap"; 10 + owner = "sembruk"; 11 + rev = "v${version}"; 12 + }; 13 + 14 + makeFlags = [ 15 + "GIT_VERSION=$(version)" 16 + "GIT_TIMESTAMP=" 17 + "SHAREDIR=$(out)/share/" 18 + "INSTALL_BINDIR=$(out)/bin" 19 + "INSTALL_MANDIR=$(out)/share/man/man1" 20 + "INSTALL_SHAREDIR=$(out)/share/" 21 + ]; 22 + 23 + installFlags = [ "DESTDIR=$(out)" ]; 24 + 25 + buildInputs = [ libroxml proj libyamlcpp boost ]; 26 + 27 + meta = with stdenv.lib; { 28 + homepage = "https://github.com/sembruk/osm2xmap"; 29 + description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format."; 30 + license = licenses.gpl3; 31 + maintainers = [ maintainers.mpickering ]; 32 + platforms = with stdenv.lib.platforms; linux; 33 + }; 34 + }
+16
pkgs/development/libraries/libroxml/default.nix
··· 1 + { stdenv, fetchurl }: 2 + 3 + stdenv.mkDerivation { 4 + name = "libroxml-2.3.0"; 5 + src = fetchurl { 6 + url = "http://download.libroxml.net/pool/v2.x/libroxml-2.3.0.tar.gz"; 7 + sha256 = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x"; 8 + }; 9 + meta = with stdenv.lib; { 10 + homepage = "http://www.libroxml.net/"; 11 + description = "This library is minimum, easy-to-use, C implementation for xml file parsing."; 12 + license = licenses.lgpl3; 13 + platforms = platforms.unix; 14 + maintainers = with maintainers; [ mpickering ]; 15 + }; 16 + }
+14 -1
pkgs/top-level/all-packages.nix
··· 9885 9885 9886 9886 libqalculate = callPackage ../development/libraries/libqalculate { }; 9887 9887 9888 + libroxml = callPackage ../development/libraries/libroxml { }; 9889 + 9888 9890 librsvg = callPackage ../development/libraries/librsvg { }; 9889 9891 9890 9892 librsync = callPackage ../development/libraries/librsync { }; ··· 10103 10105 libyaml = callPackage ../development/libraries/libyaml { }; 10104 10106 10105 10107 libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; 10108 + 10109 + libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: rec { 10110 + src = pkgs.fetchurl { 10111 + url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; 10112 + sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db"; 10113 + }; 10114 + }); 10106 10115 10107 10116 # interception-tools needs this. This should be removed when there is a new 10108 10117 # release of libyamlcpp, i.e. when the version of libyamlcpp is newer than ··· 16528 16537 inherit (gnome3) yelp_tools; 16529 16538 }; 16530 16539 16540 + osm2xmap = callPackage ../applications/misc/osm2xmap { 16541 + libyamlcpp = libyamlcpp_0_3; 16542 + }; 16543 + 16531 16544 osmctools = callPackage ../applications/misc/osmctools { }; 16532 16545 16533 16546 vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; ··· 17466 17479 testssl = callPackage ../applications/networking/testssl { }; 17467 17480 17468 17481 umurmur = callPackage ../applications/networking/umurmur { }; 17469 - 17482 + 17470 17483 udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; 17471 17484 17472 17485 unigine-valley = callPackage ../applications/graphics/unigine-valley { };