From 5dbaf18b6930dbd9d73d5f39392a447c03f5b927 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 17 Oct 2017 18:22:46 +0000 Subject: [PATCH 1/4] Add mpickering to maintainers list --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 348212df095..35b565f8906 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -461,6 +461,7 @@ mounium = "Katona László "; MP2E = "Cray Elliott "; mpcsh = "Mark Cohen "; + mpickering = "Matthew Pickering "; mpscholten = "Marc Scholten "; mpsyco = "Francis St-Amour "; mrVanDalo = "Ingolf Wanger "; From 8b362957c7683571e7bdc8f0672cc5b53f704c75 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 3 Oct 2017 21:54:50 +0000 Subject: [PATCH 2/4] libroxml: init at 2.3.0 --- pkgs/development/libraries/libroxml/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/libroxml/default.nix diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/development/libraries/libroxml/default.nix new file mode 100644 index 00000000000..3993451e19f --- /dev/null +++ b/pkgs/development/libraries/libroxml/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aea485da5e6..641e859de4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9880,6 +9880,8 @@ with pkgs; libqalculate = callPackage ../development/libraries/libqalculate { }; + libroxml = callPackage ../development/libraries/libroxml { }; + librsvg = callPackage ../development/libraries/librsvg { }; librsync = callPackage ../development/libraries/librsync { }; From 9c7c640ae4442fab7f1f67470ccfb92bf6d20529 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Sat, 3 Feb 2018 18:37:08 +0000 Subject: [PATCH 3/4] osm2xmap: init at 2.0 --- pkgs/applications/misc/osm2xmap/default.nix | 38 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 13 ++++++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/osm2xmap/default.nix diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix new file mode 100644 index 00000000000..60401c412fc --- /dev/null +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -0,0 +1,38 @@ +{ 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; + }; + + +} + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 641e859de4b..0eb4d73bcb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10101,6 +10101,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. @@ -16525,6 +16532,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 {}; @@ -17463,7 +17474,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 { }; From c8763ddc8720251c458276ad14e5bb3b4a628a0a Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Sat, 9 Dec 2017 12:37:22 +0000 Subject: [PATCH 4/4] Remove whitespace --- pkgs/applications/misc/osm2xmap/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 60401c412fc..5787adef2a3 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -31,8 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.mpickering ]; platforms = with stdenv.lib.platforms; linux; }; - - } - - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0eb4d73bcb0..4f7fdba0f8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10106,7 +10106,7 @@ with pkgs; 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