diff options
author | Graham Christensen <graham@grahamc.com> | 2018-02-03 13:58:35 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-03 13:58:35 -0500 |
commit | 92b786a2fb1d11b346e1982f02f0d1072175e83f (patch) | |
tree | 23a73ffb23fd9c52d9fd292dcc5b0a7b969091f1 /pkgs/top-level/all-packages.nix | |
parent | cff5eec3825f6158f8296eb194c2b1d53d36cad8 (diff) | |
parent | c8763ddc8720251c458276ad14e5bb3b4a628a0a (diff) | |
download | nixlib-92b786a2fb1d11b346e1982f02f0d1072175e83f.tar nixlib-92b786a2fb1d11b346e1982f02f0d1072175e83f.tar.gz nixlib-92b786a2fb1d11b346e1982f02f0d1072175e83f.tar.bz2 nixlib-92b786a2fb1d11b346e1982f02f0d1072175e83f.tar.lz nixlib-92b786a2fb1d11b346e1982f02f0d1072175e83f.tar.xz nixlib-92b786a2fb1d11b346e1982f02f0d1072175e83f.tar.zst nixlib-92b786a2fb1d11b346e1982f02f0d1072175e83f.zip |
Merge pull request #30068 from mpickering/osm2xmap
libroxml: init at 2.3.0 and osm2xmap: init at 2.0 c1f7b68
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b29b62913ac..3462be10bfec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |