JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #30068 from mpickering/osm2xmap

Browse Source 
libroxml: init at 2.3.0 and osm2xmap: init at 2.0 c1f7b68
This commit is contained in:
Graham Christensen 2018-02-03 13:58:35 -05:00 committed by GitHub
commit 92b786a2fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -461,6 +461,7 @@
mounium = "Katona László <muoniurn@gmail.com>";
MP2E = "Cray Elliott <MP2E@archlinux.us>";
mpcsh = "Mark Cohen <m@mpc.sh>";
mpickering = "Matthew Pickering <matthewtpickering@gmail.com>";
mpscholten = "Marc Scholten <marc@mpscholten.de>";
mpsyco = "Francis St-Amour <fr.st-amour@gmail.com>";
mrVanDalo = "Ingolf Wanger <contact@ingolf-wagner.de>";

34
pkgs/applications/misc/osm2xmap/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, fetchFromGitHub, libroxml, proj, libyamlcpp, boost } :
stdenv.mkDerivation rec {
name = "osm2xmap-${version}";
version = "2.0";
src = fetchFromGitHub {
sha256 = "1d3f18wzk240yp0q8i2vskhcfj5ar61s4hw83vgps0wr2aglph3w";
repo = "osm2xmap";
owner = "sembruk";
rev = "v${version}";
};
makeFlags = [
"GIT_VERSION=$(version)"
"GIT_TIMESTAMP="
"SHAREDIR=$(out)/share/"
"INSTALL_BINDIR=$(out)/bin"
"INSTALL_MANDIR=$(out)/share/man/man1"
"INSTALL_SHAREDIR=$(out)/share/"
];
installFlags = [ "DESTDIR=$(out)" ];
buildInputs = [ libroxml proj libyamlcpp boost ];
meta = with stdenv.lib; {
homepage = "https://github.com/sembruk/osm2xmap";
description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format.";
license = licenses.gpl3;
maintainers = [ maintainers.mpickering ];
platforms = with stdenv.lib.platforms; linux;
};
}

16
pkgs/development/libraries/libroxml/default.nix Normal file
View File

@ -0,0 +1,16 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "libroxml-2.3.0";
src = fetchurl {
url = "http://download.libroxml.net/pool/v2.x/libroxml-2.3.0.tar.gz";
sha256 = "0y0vc9n4rfbimjp28nx4kdfzz08j5xymh5xjy84l9fhfac5z5a0x";
};
meta = with stdenv.lib; {
homepage = "http://www.libroxml.net/";
description = "This library is minimum, easy-to-use, C implementation for xml file parsing.";
license = licenses.lgpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ mpickering ];
};
}

15
pkgs/top-level/all-packages.nix
View File

@ -9885,6 +9885,8 @@ with pkgs;
libqalculate = callPackage ../development/libraries/libqalculate { };
libroxml = callPackage ../development/libraries/libroxml { };
librsvg = callPackage ../development/libraries/librsvg { };
librsync = callPackage ../development/libraries/librsync { };
@ -10104,6 +10106,13 @@ with pkgs;
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: rec {
src = pkgs.fetchurl {
url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz";
sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db";
};
});
# interception-tools needs this. This should be removed when there is a new
# release of libyamlcpp, i.e. when the version of libyamlcpp is newer than
# 0.5.3.
@ -16528,6 +16537,10 @@ with pkgs;
inherit (gnome3) yelp_tools;
};
osm2xmap = callPackage ../applications/misc/osm2xmap {
libyamlcpp = libyamlcpp_0_3;
};
osmctools = callPackage ../applications/misc/osmctools { };
vivaldi = callPackage ../applications/networking/browsers/vivaldi {};
@ -17466,7 +17479,7 @@ with pkgs;
testssl = callPackage ../applications/networking/testssl { };
umurmur = callPackage ../applications/networking/umurmur { };
udocker = pythonPackages.callPackage ../tools/virtualization/udocker { };
unigine-valley = callPackage ../applications/graphics/unigine-valley { };