From 5c25772dc308151b3c6197476a6489de3c42a947 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 09:53:24 +0800 Subject: [PATCH 1/8] urdfdom-headers: 1.1.1 -> 2.0.0 --- pkgs/by-name/ur/urdfdom-headers/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ur/urdfdom-headers/package.nix b/pkgs/by-name/ur/urdfdom-headers/package.nix index e1d0ed250c2d..b1d0907af916 100644 --- a/pkgs/by-name/ur/urdfdom-headers/package.nix +++ b/pkgs/by-name/ur/urdfdom-headers/package.nix @@ -9,20 +9,20 @@ stdenv.mkDerivation rec { pname = "urdfdom-headers"; - version = "1.1.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ros"; repo = "urdfdom_headers"; rev = version; - hash = "sha256-FQSnYuTc40MOxyFsMPfoCIonP+4AUQxdq74eoQ9tOoo="; + hash = "sha256-K05pVi+s3x7trzQRPHLuxSMK5FRnmcPArkDsZ19BwWo="; }; patches = [ # Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom_headers/pull/66) (fetchpatch { - url = "https://github.com/ros/urdfdom_headers/commit/6e0cea148c3a7123f8367cd48d5709a4490c32f1.patch"; - hash = "sha256-LC2TACGma/k6+WE9fTkzY98SgJYKsVuj5O9v84Q5mQ4="; + url = "https://github.com/ros/urdfdom_headers/commit/fa89f2d4744839827f41579004537c966a097681.patch"; + hash = "sha256-w6PPKCpbR4dGsudVEz+SO9ylXVayLPRAl3VvpMt4DHo="; }) ]; From 5a6388ae5ea96856169d370b6cd3016092ea7562 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 09:54:06 +0800 Subject: [PATCH 2/8] urdfdom-headers: use finalAttrs and tag --- pkgs/by-name/ur/urdfdom-headers/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ur/urdfdom-headers/package.nix b/pkgs/by-name/ur/urdfdom-headers/package.nix index b1d0907af916..42b0f0ec0b1f 100644 --- a/pkgs/by-name/ur/urdfdom-headers/package.nix +++ b/pkgs/by-name/ur/urdfdom-headers/package.nix @@ -7,14 +7,14 @@ validatePkgConfig, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "urdfdom-headers"; version = "2.0.0"; src = fetchFromGitHub { owner = "ros"; repo = "urdfdom_headers"; - rev = version; + tag = finalAttrs.version; hash = "sha256-K05pVi+s3x7trzQRPHLuxSMK5FRnmcPArkDsZ19BwWo="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lopsided98 ]; platforms = platforms.all; }; -} +}) From 22faea48d3ccd94c32191967905acd20cad3b75c Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 09:54:44 +0800 Subject: [PATCH 3/8] urdfdom-headers: remove with lib --- pkgs/by-name/ur/urdfdom-headers/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ur/urdfdom-headers/package.nix b/pkgs/by-name/ur/urdfdom-headers/package.nix index 42b0f0ec0b1f..522c9fcc9044 100644 --- a/pkgs/by-name/ur/urdfdom-headers/package.nix +++ b/pkgs/by-name/ur/urdfdom-headers/package.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation (finalAttrs: { validatePkgConfig ]; - meta = with lib; { + meta = { description = "URDF (U-Robot Description Format) headers provides core data structure headers for URDF"; homepage = "https://github.com/ros/urdfdom_headers"; - license = licenses.bsd3; - maintainers = with maintainers; [ lopsided98 ]; - platforms = platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lopsided98 ]; + platforms = lib.platforms.all; }; }) From 09b9943cf48dfd252f874b8657b068341de45efd Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 09:55:22 +0800 Subject: [PATCH 4/8] urdfdom: 4.0.0 -> 5.0.2 --- .../ur/urdfdom/cmake-install-absolute.patch | 84 +++++++++++++++++++ pkgs/by-name/ur/urdfdom/package.nix | 10 +-- 2 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/ur/urdfdom/cmake-install-absolute.patch diff --git a/pkgs/by-name/ur/urdfdom/cmake-install-absolute.patch b/pkgs/by-name/ur/urdfdom/cmake-install-absolute.patch new file mode 100644 index 000000000000..f29f8693aa4f --- /dev/null +++ b/pkgs/by-name/ur/urdfdom/cmake-install-absolute.patch @@ -0,0 +1,84 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,7 @@ option(APPEND_PROJECT_NAME_TO_INCLUDEDIR + + if(APPEND_PROJECT_NAME_TO_INCLUDEDIR) + set(CMAKE_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}") ++ set(CMAKE_INSTALL_FULL_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}") + endif() + + # set the default build type +@@ -59,9 +60,9 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}" + + enable_testing() + +-set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake) +-string(REGEX REPLACE "[^/]+" ".." RELATIVE_PATH_CMAKE_DIR_TO_PREFIX "${CMAKE_CONFIG_INSTALL_DIR}") +-string(REGEX REPLACE "[^/]+" ".." RELATIVE_PATH_LIBDIR_TO_PREFIX "${CMAKE_INSTALL_LIBDIR}") ++set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}/cmake) ++file(RELATIVE_PATH RELATIVE_PATH_CMAKE_DIR_TO_PREFIX "${CMAKE_CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}") ++file(RELATIVE_PATH RELATIVE_PATH_LIBDIR_TO_PREFIX "${CMAKE_INSTALL_FULL_LIBDIR}" "${CMAKE_INSTALL_PREFIX}") + + add_subdirectory(urdf_parser) + +@@ -69,6 +70,12 @@ set(PKG_NAME ${PROJECT_NAME}) + set(PKG_LIBRARIES urdfdom_sensor urdfdom_model urdfdom_world) + set(PKG_DEPENDS urdfdom_headers) + set(PKG_EXPORTS urdfdom) ++string(REPLACE ++ "${CMAKE_INSTALL_PREFIX}" "\${${PROJECT_NAME}_DIR}/${RELATIVE_PATH_CMAKE_DIR_TO_PREFIX}" ++ CMAKE_CONF_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") ++string(REPLACE ++ "${CMAKE_INSTALL_PREFIX}" "\${${PROJECT_NAME}_DIR}/${RELATIVE_PATH_CMAKE_DIR_TO_PREFIX}" ++ CMAKE_CONF_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + set(cmake_conf_file "cmake/urdfdom-config") + include(CMakePackageConfigHelpers) + write_basic_package_version_file( +@@ -92,6 +99,8 @@ install(FILES package.xml DESTINATION share/${PROJECT_NAME}) + set(PKG_DESC "Unified Robot Description Format") + set(PKG_DEPENDS "urdfdom_headers") # make the list separated by spaces instead of ; + set(PKG_URDF_LIBS "-lurdfdom_sensor -lurdfdom_model -lurdfdom_world") ++string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" PKG_CONF_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") ++string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" PKG_CONF_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + set(pkg_conf_file "cmake/pkgconfig/urdfdom.pc") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/${pkg_conf_file} +diff --git a/cmake/pkgconfig/urdfdom.pc.in b/cmake/pkgconfig/urdfdom.pc.in +index 77d1d9f..01ccb89 100644 +--- a/cmake/pkgconfig/urdfdom.pc.in ++++ b/cmake/pkgconfig/urdfdom.pc.in +@@ -1,8 +1,8 @@ + # This file was generated by CMake for @PROJECT_NAME@ + prefix=${pcfiledir}/../@RELATIVE_PATH_LIBDIR_TO_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@PKG_CONF_LIBDIR@ ++includedir=@PKG_CONF_INCLUDEDIR@ + + Name: @PKG_NAME@ + Description: @PKG_DESC@ +diff --git a/cmake/urdfdom-config.cmake.in b/cmake/urdfdom-config.cmake.in +index ee84f41..9a77019 100644 +--- a/cmake/urdfdom-config.cmake.in ++++ b/cmake/urdfdom-config.cmake.in +@@ -8,16 +8,16 @@ set(@PKG_NAME@_CONFIG_INCLUDED TRUE) + set(CMAKE_MODULE_PATH_BACKUP_URDFDOM ${CMAKE_MODULE_PATH}) + list(APPEND CMAKE_MODULE_PATH "${@PROJECT_NAME@_DIR}") + +-set(@PKG_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@") ++set(@PKG_NAME@_INCLUDE_DIRS "@CMAKE_CONF_INCLUDEDIR@") + + foreach(lib @PKG_LIBRARIES@) + set(onelib "${lib}-NOTFOUND") + set(onelibd "${lib}-NOTFOUND") + find_library(onelib ${lib} +- PATHS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_LIBDIR@" ++ PATHS "@CMAKE_CONF_LIBDIR@" + NO_DEFAULT_PATH) + find_library(onelibd ${lib}d +- PATHS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_LIBDIR@" ++ PATHS "@CMAKE_CONF_LIBDIR@" + NO_DEFAULT_PATH) + if(onelib-NOTFOUND AND onelibd-NOTFOUND) + message(FATAL_ERROR "Library '${lib}' in package @PKG_NAME@ is not installed properly") diff --git a/pkgs/by-name/ur/urdfdom/package.nix b/pkgs/by-name/ur/urdfdom/package.nix index ec65438b542e..642800118c50 100644 --- a/pkgs/by-name/ur/urdfdom/package.nix +++ b/pkgs/by-name/ur/urdfdom/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, pkg-config, validatePkgConfig, @@ -13,21 +12,18 @@ stdenv.mkDerivation rec { pname = "urdfdom"; - version = "4.0.0"; + version = "5.0.2"; src = fetchFromGitHub { owner = "ros"; repo = "urdfdom"; rev = version; - hash = "sha256-t1ff5aRHE7LuQdCXuooWPDUgPWjyYyQmQUB1RJmte1w="; + hash = "sha256-Df7njCd1W373R2XU6Jh15HlfFHhHM+ErivGiK/95Aak="; }; patches = [ # Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom/pull/142) - (fetchpatch { - url = "https://github.com/ros/urdfdom/commit/61a7e35cd5abece97259e76aed8504052b2f5b53.patch"; - hash = "sha256-b3bEbbaSUDkwTEHJ8gVPEb+AR/zuWwLqiAW5g1T1dPU="; - }) + ./cmake-install-absolute.patch ]; nativeBuildInputs = [ From 128eba8a55e73f8d43e17bcea1773a31c4f70c81 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 09:56:00 +0800 Subject: [PATCH 5/8] urdfdom: use finalAttrs and tag --- pkgs/by-name/ur/urdfdom/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ur/urdfdom/package.nix b/pkgs/by-name/ur/urdfdom/package.nix index 642800118c50..d6ac13964164 100644 --- a/pkgs/by-name/ur/urdfdom/package.nix +++ b/pkgs/by-name/ur/urdfdom/package.nix @@ -10,14 +10,14 @@ urdfdom-headers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "urdfdom"; version = "5.0.2"; src = fetchFromGitHub { owner = "ros"; repo = "urdfdom"; - rev = version; + tag = finalAttrs.version; hash = "sha256-Df7njCd1W373R2XU6Jh15HlfFHhHM+ErivGiK/95Aak="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lopsided98 ]; platforms = platforms.all; }; -} +}) From 94e1899761d102707adc39deeabc5d165a7f6b5c Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 09:56:24 +0800 Subject: [PATCH 6/8] urdfdom: remove with lib --- pkgs/by-name/ur/urdfdom/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ur/urdfdom/package.nix b/pkgs/by-name/ur/urdfdom/package.nix index d6ac13964164..a3d7823ce323 100644 --- a/pkgs/by-name/ur/urdfdom/package.nix +++ b/pkgs/by-name/ur/urdfdom/package.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ urdfdom-headers ]; - meta = with lib; { + meta = { description = "Provides core data structures and a simple XML parser for populating the class data structures from an URDF file"; homepage = "https://github.com/ros/urdfdom"; - license = licenses.bsd3; - maintainers = with maintainers; [ lopsided98 ]; - platforms = platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lopsided98 ]; + platforms = lib.platforms.all; }; }) From 58e145364c3605ff24d483b09dd1559461ea7832 Mon Sep 17 00:00:00 2001 From: kyehn Date: Wed, 3 Dec 2025 16:47:05 +0000 Subject: [PATCH 7/8] urdfdom-headers: 2.0.0 -> 2.0.1 Diff: https://github.com/ros/urdfdom_headers/compare/2.0.0...2.0.1 --- pkgs/by-name/ur/urdfdom-headers/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ur/urdfdom-headers/package.nix b/pkgs/by-name/ur/urdfdom-headers/package.nix index 522c9fcc9044..20c19dda0f25 100644 --- a/pkgs/by-name/ur/urdfdom-headers/package.nix +++ b/pkgs/by-name/ur/urdfdom-headers/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "urdfdom-headers"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "ros"; repo = "urdfdom_headers"; tag = finalAttrs.version; - hash = "sha256-K05pVi+s3x7trzQRPHLuxSMK5FRnmcPArkDsZ19BwWo="; + hash = "sha256-tBNoG5gH3haZETUlI4Pn1mg14T/sMil9n/iSzjJC+Rg="; }; patches = [ From 3d11ebc32d8fd5321f2b737f564a2c01f4a788d1 Mon Sep 17 00:00:00 2001 From: kyehn Date: Thu, 4 Dec 2025 02:13:56 +0000 Subject: [PATCH 8/8] urdfdom: 5.0.2 -> 5.0.3 Diff: https://github.com/ros/urdfdom/compare/5.0.2...5.0.3 --- pkgs/by-name/ur/urdfdom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ur/urdfdom/package.nix b/pkgs/by-name/ur/urdfdom/package.nix index a3d7823ce323..b6adda9203ea 100644 --- a/pkgs/by-name/ur/urdfdom/package.nix +++ b/pkgs/by-name/ur/urdfdom/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "urdfdom"; - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "ros"; repo = "urdfdom"; tag = finalAttrs.version; - hash = "sha256-Df7njCd1W373R2XU6Jh15HlfFHhHM+ErivGiK/95Aak="; + hash = "sha256-WZA3rzulPO1Si/kFqGF+8si2kRC8xOhlparoO8CvN0g="; }; patches = [