From 9bbc24e2669869121f66ca10808f2bbd1c92d0c4 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 8 Apr 2023 16:43:51 -0400 Subject: [PATCH 1/2] urdfdom: cleanup dependencies * urdfdom no longer depends on boost * urdfdom includes tinyxml.h in its public headers, therefore tinyxml must be propagated --- pkgs/development/libraries/urdfdom/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/urdfdom/default.nix b/pkgs/development/libraries/urdfdom/default.nix index 91424d7d6d95..a6661a729655 100644 --- a/pkgs/development/libraries/urdfdom/default.nix +++ b/pkgs/development/libraries/urdfdom/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, validatePkgConfig -, tinyxml, boost, urdfdom-headers, console-bridge }: +, urdfdom-headers, console-bridge, tinyxml }: stdenv.mkDerivation rec { pname = "urdfdom"; @@ -21,8 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config validatePkgConfig ]; - buildInputs = [ tinyxml boost ]; - propagatedBuildInputs = [ urdfdom-headers console-bridge ]; + propagatedBuildInputs = [ urdfdom-headers console-bridge tinyxml ]; meta = with lib; { description = "Provides core data structures and a simple XML parser for populating the class data structures from an URDF file"; From f68a0d0fd7539d93c7454989f71fd1c824f3b46f Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 18 Jun 2023 14:27:39 -0400 Subject: [PATCH 2/2] urdfdom: 3.1.0 -> 3.1.1 --- pkgs/development/libraries/urdfdom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/urdfdom/default.nix b/pkgs/development/libraries/urdfdom/default.nix index a6661a729655..6e59914044fc 100644 --- a/pkgs/development/libraries/urdfdom/default.nix +++ b/pkgs/development/libraries/urdfdom/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "urdfdom"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "ros"; repo = pname; rev = version; - hash = "sha256-9MJnify4zcDBSZVJZCN/XupN5xax+U4PLee54gVVw3Q="; + hash = "sha256-UdkGJAXK3Q8QJaqMZBA5/FKUgWq9EVeqkqwVewTlTD8="; }; patches = [