diff --git a/melodic/abseil-cpp/default.nix b/melodic/abseil-cpp/default.nix index f1fbd3ccff..28aea49171 100644 --- a/melodic/abseil-cpp/default.nix +++ b/melodic/abseil-cpp/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The abseil_cpp package''; - #license = lib.licenses.Apache; + license = with lib.licenses; [ "Apache-1.0" ]; }; } diff --git a/melodic/acado/default.nix b/melodic/acado/default.nix index 97d3778706..f833734103 100644 --- a/melodic/acado/default.nix +++ b/melodic/acado/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ACADO Toolkit''; - #license = lib.licenses.LGPL3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/access-point-control/default.nix b/melodic/access-point-control/default.nix index 7b311cbbbe..e1f5246afc 100644 --- a/melodic/access-point-control/default.nix +++ b/melodic/access-point-control/default.nix @@ -22,6 +22,6 @@ buildRosPackage { implement the API for various access-point models: for example: hostapd_access_point for hostapd-based control or linksys_access_point for Linksys router web interface.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ackermann-msgs/default.nix b/melodic/ackermann-msgs/default.nix index 5879a37e43..e5b0fb2d0f 100644 --- a/melodic/ackermann-msgs/default.nix +++ b/melodic/ackermann-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS messages for robots using Ackermann steering.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ackermann-steering-controller/default.nix b/melodic/ackermann-steering-controller/default.nix index d65ec4d316..8dec433f4d 100644 --- a/melodic/ackermann-steering-controller/default.nix +++ b/melodic/ackermann-steering-controller/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "d6de33231e9dfdcb67a15c0c397f77d3e3e656823cabd02eb2464ba4a617b83a"; }; - buildInputs = [ hardware-interface pluginlib boost realtime-tools diff-drive-controller roscpp nav-msgs urdf controller-interface tf ]; - checkInputs = [ gazebo-ros rostest controller-manager std-srvs std-msgs rosunit xacro geometry-msgs ]; - propagatedBuildInputs = [ hardware-interface pluginlib boost realtime-tools diff-drive-controller roscpp nav-msgs urdf controller-interface tf ]; + buildInputs = [ hardware-interface pluginlib boost diff-drive-controller realtime-tools roscpp nav-msgs urdf controller-interface tf ]; + checkInputs = [ gazebo-ros controller-manager std-srvs rostest std-msgs rosunit xacro geometry-msgs ]; + propagatedBuildInputs = [ hardware-interface pluginlib boost diff-drive-controller realtime-tools roscpp nav-msgs urdf controller-interface tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Controller for a steer drive mobile base.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/actionlib-lisp/default.nix b/melodic/actionlib-lisp/default.nix index 5907e45f83..b216a56858 100644 --- a/melodic/actionlib-lisp/default.nix +++ b/melodic/actionlib-lisp/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''actionlib_lisp is a native implementation of the famous actionlib in Common Lisp. It provides a client and a simple server.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/actionlib-msgs/default.nix b/melodic/actionlib-msgs/default.nix index d3c21963bf..f2166f3000 100644 --- a/melodic/actionlib-msgs/default.nix +++ b/melodic/actionlib-msgs/default.nix @@ -22,6 +22,6 @@ buildRosPackage { the actionlib API see the actionlib package.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/actionlib-tutorials/default.nix b/melodic/actionlib-tutorials/default.nix index 980bd82525..74201cd123 100644 --- a/melodic/actionlib-tutorials/default.nix +++ b/melodic/actionlib-tutorials/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "202b1bd5a2d7cde96dcd20fa54fb6fc017ec6e1252575b5413618310c536163e"; }; - buildInputs = [ message-generation actionlib-msgs actionlib std-msgs roscpp ]; + buildInputs = [ actionlib-msgs message-generation actionlib std-msgs roscpp ]; propagatedBuildInputs = [ roscpp message-runtime actionlib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The actionlib_tutorials package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/actionlib/default.nix b/melodic/actionlib/default.nix index 907a60adeb..9776d417e9 100644 --- a/melodic/actionlib/default.nix +++ b/melodic/actionlib/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "7b6d1fba25d1f4de6d3b87d82cac1aae73a88bc4811e7e55626f9b21db34f99c"; }; - buildInputs = [ rostest message-generation boost actionlib-msgs rospy std-msgs roscpp ]; + buildInputs = [ boost actionlib-msgs rostest message-generation rospy std-msgs roscpp ]; checkInputs = [ rosnode ]; propagatedBuildInputs = [ boost actionlib-msgs pythonPackages.wxPython rostest roslib message-runtime rostopic rospy std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; @@ -22,6 +22,6 @@ buildRosPackage { interfacing with preemptable tasks. Examples of this include moving the base to a target location, performing a laser scan and returning the resulting point cloud, detecting the handle of a door, etc.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/adi-driver/default.nix b/melodic/adi-driver/default.nix index 0eef80e861..c3cfe8700d 100644 --- a/melodic/adi-driver/default.nix +++ b/melodic/adi-driver/default.nix @@ -14,11 +14,11 @@ buildRosPackage { buildInputs = [ std-srvs sensor-msgs roscpp roslint ]; checkInputs = [ rostest roslaunch ]; - propagatedBuildInputs = [ rviz-imu-plugin std-srvs rviz rqt-plot sensor-msgs roscpp imu-filter-madgwick xacro ]; + propagatedBuildInputs = [ std-srvs sensor-msgs rviz-imu-plugin rviz rqt-plot roscpp imu-filter-madgwick xacro ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The adi_driver package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/agni-tf-tools/default.nix b/melodic/agni-tf-tools/default.nix index 92f9184d36..673bb6cdd4 100644 --- a/melodic/agni-tf-tools/default.nix +++ b/melodic/agni-tf-tools/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "a9e0e0179ff125da7fca8680b2428754c2fb434db0b9d190865e95f6c650645b"; }; - buildInputs = [ rviz tf2-ros eigen roscpp qt5.qtbase ]; + buildInputs = [ tf2-ros qt5.qtbase rviz eigen roscpp ]; propagatedBuildInputs = [ roscpp rviz tf2-ros ]; nativeBuildInputs = [ catkin ]; @@ -20,6 +20,6 @@ buildRosPackage { description = ''This package provides a gui program as well as a rviz plugin to publish static transforms. Both support the transformation between various Euler angle representations. The rviz plugin also allows to configure the transform with an interactive marker.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/allocators/default.nix b/melodic/allocators/default.nix index bdc5605c31..d3a638c0f9 100644 --- a/melodic/allocators/default.nix +++ b/melodic/allocators/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''Contains aligned allocation functions, as well as an STL-compatible AlignedAllocator class.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/amcl/default.nix b/melodic/amcl/default.nix index 399fe77fb9..00cab0256f 100644 --- a/melodic/amcl/default.nix +++ b/melodic/amcl/default.nix @@ -28,6 +28,6 @@ buildRosPackage { This node is derived, with thanks, from Andrew Howard's excellent 'amcl' Player driver.

''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/angles/default.nix b/melodic/angles/default.nix index 0a8634ab6e..89152f58e7 100644 --- a/melodic/angles/default.nix +++ b/melodic/angles/default.nix @@ -25,6 +25,6 @@ buildRosPackage { by joint limits, this package is what you need. The code in this packge is stable and well tested. There are no plans for major changes in the near future.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/app-manager/default.nix b/melodic/app-manager/default.nix index 922d6b7de6..1d86c65045 100644 --- a/melodic/app-manager/default.nix +++ b/melodic/app-manager/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''app_manager''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ar-track-alvar-msgs/default.nix b/melodic/ar-track-alvar-msgs/default.nix index f788919f46..fe32adf8e7 100644 --- a/melodic/ar-track-alvar-msgs/default.nix +++ b/melodic/ar-track-alvar-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package is a ROS wrapper for Alvar, an open source AR tag tracking library.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ar-track-alvar/default.nix b/melodic/ar-track-alvar/default.nix index 3e1fd343b5..3765bb9ba2 100644 --- a/melodic/ar-track-alvar/default.nix +++ b/melodic/ar-track-alvar/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package is a ROS wrapper for Alvar, an open source AR tag tracking library.''; - #license = lib.licenses.LGPL-2.1; + license = with lib.licenses; [ lgpl21 ]; }; } diff --git a/melodic/arbotix-controllers/default.nix b/melodic/arbotix-controllers/default.nix index 946fbff8a1..c051efc69a 100644 --- a/melodic/arbotix-controllers/default.nix +++ b/melodic/arbotix-controllers/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Extends the arbotix_python package with a number of more sophisticated ROS wrappers for common devices.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/arbotix-firmware/default.nix b/melodic/arbotix-firmware/default.nix index 8b03ba29dc..91e5f059ae 100644 --- a/melodic/arbotix-firmware/default.nix +++ b/melodic/arbotix-firmware/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''Firmware source code for ArbotiX ROS bindings.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/arbotix-msgs/default.nix b/melodic/arbotix-msgs/default.nix index 4a7e95c426..70d7bc1914 100644 --- a/melodic/arbotix-msgs/default.nix +++ b/melodic/arbotix-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages and Services definitions for the ArbotiX.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/arbotix-python/default.nix b/melodic/arbotix-python/default.nix index 5715155754..f75afbad9f 100644 --- a/melodic/arbotix-python/default.nix +++ b/melodic/arbotix-python/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Bindings and low-level controllers for ArbotiX-powered robots.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/arbotix-sensors/default.nix b/melodic/arbotix-sensors/default.nix index 9ed99ada6a..35501376b2 100644 --- a/melodic/arbotix-sensors/default.nix +++ b/melodic/arbotix-sensors/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Extends the arbotix_node package with a number of more sophisticated ROS wrappers for common devices.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/arbotix/default.nix b/melodic/arbotix/default.nix index e361d6e841..4d6c5d83a9 100644 --- a/melodic/arbotix/default.nix +++ b/melodic/arbotix/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "3e72d718f9b9129b8537614cc5ae68e696b97def92315b859a5d2f00219f09e1"; }; - propagatedBuildInputs = [ arbotix-sensors arbotix-firmware arbotix-python arbotix-controllers arbotix-msgs ]; + propagatedBuildInputs = [ arbotix-controllers arbotix-sensors arbotix-firmware arbotix-python arbotix-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ArbotiX Drivers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ariles-ros/default.nix b/melodic/ariles-ros/default.nix index 44599ca9d3..13a6b21747 100644 --- a/melodic/ariles-ros/default.nix +++ b/melodic/ariles-ros/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Catkin package Ariles serialization/configuration library''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/asmach-tutorials/default.nix b/melodic/asmach-tutorials/default.nix index ec36a2d8a5..821ed2571a 100644 --- a/melodic/asmach-tutorials/default.nix +++ b/melodic/asmach-tutorials/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "ca0024ddfd9f62f4c76291300d9cf50e15fbc87e64af3823255db33e4285792e"; }; - buildInputs = [ turtlesim message-generation actionlib asmach actionlib-msgs rospy smach-ros ]; - propagatedBuildInputs = [ turtlesim actionlib asmach actionlib-msgs rospy smach-ros ]; + buildInputs = [ turtlesim actionlib-msgs smach-ros message-generation asmach actionlib rospy ]; + propagatedBuildInputs = [ turtlesim actionlib-msgs smach-ros actionlib asmach rospy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package containes numerous examples of how to use SMACH. See the examples directory.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/asmach/default.nix b/melodic/asmach/default.nix index 86a36b6584..5b0d9d2f69 100644 --- a/melodic/asmach/default.nix +++ b/melodic/asmach/default.nix @@ -21,6 +21,6 @@ buildRosPackage { hierarchical state machines. SMACH is a new library that takes advantage of very old concepts in order to quickly create robust robot behavior with maintainable and modular code.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/assimp-devel/default.nix b/melodic/assimp-devel/default.nix index fbeece7f66..68caeae461 100644 --- a/melodic/assimp-devel/default.nix +++ b/melodic/assimp-devel/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''assimp library''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/assisted-teleop/default.nix b/melodic/assisted-teleop/default.nix index d2eaf905f9..3bbb5dbbef 100644 --- a/melodic/assisted-teleop/default.nix +++ b/melodic/assisted-teleop/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "5cf3f26df26c9c7a8045f5d75aa0b6b6fecccd58a38495b850c49b94540969e5"; }; - buildInputs = [ costmap-2d filters pluginlib base-local-planner sensor-msgs message-filters roscpp tf2-ros move-base-msgs actionlib angles roslib geometry-msgs eigen ]; - propagatedBuildInputs = [ costmap-2d filters pluginlib base-local-planner sensor-msgs message-filters roscpp tf2-ros move-base-msgs actionlib angles roslib geometry-msgs eigen ]; + buildInputs = [ costmap-2d filters pluginlib base-local-planner sensor-msgs message-filters tf2-ros move-base-msgs roslib actionlib angles roscpp geometry-msgs eigen ]; + propagatedBuildInputs = [ costmap-2d filters pluginlib base-local-planner sensor-msgs message-filters tf2-ros move-base-msgs roslib actionlib angles roscpp geometry-msgs eigen ]; nativeBuildInputs = [ catkin ]; meta = { @@ -24,6 +24,6 @@ buildRosPackage { contains LaserScanMaxRangeFilter, which is a LaserScan filter plugin that takes max range values in a scan and turns them into valid values that are slightly less than max range.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/astuff-sensor-msgs/default.nix b/melodic/astuff-sensor-msgs/default.nix index 1ee25fd1b9..34a2ffef0f 100644 --- a/melodic/astuff-sensor-msgs/default.nix +++ b/melodic/astuff-sensor-msgs/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Messages specific to AStuff-provided sensors.''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/async-comm/default.nix b/melodic/async-comm/default.nix index 567626d0d3..cddddb61f4 100644 --- a/melodic/async-comm/default.nix +++ b/melodic/async-comm/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''A C++ library for asynchronous serial communication''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/async-web-server-cpp/default.nix b/melodic/async-web-server-cpp/default.nix index 0376301389..77d4fcc2f0 100644 --- a/melodic/async-web-server-cpp/default.nix +++ b/melodic/async-web-server-cpp/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Asynchronous Web/WebSocket Server in C++''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/audibot-description/default.nix b/melodic/audibot-description/default.nix index ed171f8cd4..a0132dd40c 100644 --- a/melodic/audibot-description/default.nix +++ b/melodic/audibot-description/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Meshes and URDF descriptions for audibot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/audibot-gazebo/default.nix b/melodic/audibot-gazebo/default.nix index 25c870bb6e..07fa5c9873 100644 --- a/melodic/audibot-gazebo/default.nix +++ b/melodic/audibot-gazebo/default.nix @@ -14,11 +14,11 @@ buildRosPackage { buildInputs = [ gazebo-ros tf roscpp ]; checkInputs = [ rostest rospy ]; - propagatedBuildInputs = [ gazebo-ros gazebo-ros-pkgs rviz robot-state-publisher tf roscpp ]; + propagatedBuildInputs = [ gazebo-ros gazebo-ros-pkgs roscpp rviz robot-state-publisher tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Gazebo model plugin to simulate Audibot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/audibot/default.nix b/melodic/audibot/default.nix index 4398630ddf..a59bb5ec95 100644 --- a/melodic/audibot/default.nix +++ b/melodic/audibot/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Metapackage for audibot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/audio-capture/default.nix b/melodic/audio-capture/default.nix index 5de59393aa..a9aefb83a7 100644 --- a/melodic/audio-capture/default.nix +++ b/melodic/audio-capture/default.nix @@ -13,13 +13,13 @@ buildRosPackage { }; buildInputs = [ gst_all_1.gst-plugins-base roscpp gst_all_1.gstreamer audio-common-msgs ]; - propagatedBuildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base roscpp gst_all_1.gst-plugins-ugly audio-common-msgs gst_all_1.gst-plugins-good ]; + propagatedBuildInputs = [ gst_all_1.gst-plugins-ugly gst_all_1.gstreamer gst_all_1.gst-plugins-base roscpp audio-common-msgs gst_all_1.gst-plugins-good ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Transports audio from a source to a destination. Audio sources can come from a microphone or file. The destination can play the audio or save it to an mp3 file.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/audio-common-msgs/default.nix b/melodic/audio-common-msgs/default.nix index f3978a630b..69e6d83357 100644 --- a/melodic/audio-common-msgs/default.nix +++ b/melodic/audio-common-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages for transmitting audio via ROS''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/audio-common/default.nix b/melodic/audio-common/default.nix index 2b24edfc09..0ec1a2e1ab 100644 --- a/melodic/audio-common/default.nix +++ b/melodic/audio-common/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Common code for working with audio in ROS''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/audio-play/default.nix b/melodic/audio-play/default.nix index cd571da80f..6eb475b337 100644 --- a/melodic/audio-play/default.nix +++ b/melodic/audio-play/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ gst_all_1.gst-plugins-base roscpp gst_all_1.gstreamer audio-common-msgs ]; - propagatedBuildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base roscpp gst_all_1.gst-plugins-ugly audio-common-msgs gst_all_1.gst-plugins-good ]; + propagatedBuildInputs = [ gst_all_1.gst-plugins-ugly gst_all_1.gstreamer gst_all_1.gst-plugins-base roscpp audio-common-msgs gst_all_1.gst-plugins-good ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Outputs audio to a speaker from a source node.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/automotive-autonomy-msgs/default.nix b/melodic/automotive-autonomy-msgs/default.nix index c11df015af..04837a7dc7 100644 --- a/melodic/automotive-autonomy-msgs/default.nix +++ b/melodic/automotive-autonomy-msgs/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Messages for vehicle automation''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/automotive-navigation-msgs/default.nix b/melodic/automotive-navigation-msgs/default.nix index 048c05db2d..c7c3be24f1 100644 --- a/melodic/automotive-navigation-msgs/default.nix +++ b/melodic/automotive-navigation-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Generic Messages for Navigation Objectives in Automotive Automation Software''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/automotive-platform-msgs/default.nix b/melodic/automotive-platform-msgs/default.nix index a22f2c1f28..c1a883a0d1 100644 --- a/melodic/automotive-platform-msgs/default.nix +++ b/melodic/automotive-platform-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Generic Messages for Communication with an Automotive Autonomous Platform''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/aws-common/default.nix b/melodic/aws-common/default.nix new file mode 100644 index 0000000000..3c59e16e06 --- /dev/null +++ b/melodic/aws-common/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2019 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ros-environment, openssl, gtest, catkin, curl, zlib, cmake, utillinux, gmock }: +buildRosPackage { + pname = "ros-melodic-aws-common"; + version = "2.0.0-r2"; + + src = fetchurl { + url = https://github.com/aws-gbp/aws_common-release/archive/release/melodic/aws_common/2.0.0-2.tar.gz; + sha256 = "fd9f9814aef06e687d94c1158f8f401e035005b187e8e22321567cf5db602dcd"; + }; + + buildInputs = [ ros-environment catkin curl openssl utillinux zlib ]; + checkInputs = [ gtest gmock ]; + propagatedBuildInputs = [ zlib openssl utillinux curl ]; + nativeBuildInputs = [ cmake ]; + + meta = { + description = ''Common AWS SDK utilities, intended for use by ROS packages using the AWS SDK''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/melodic/aws-ros1-common/default.nix b/melodic/aws-ros1-common/default.nix index a76fed30aa..77325d5a5b 100644 --- a/melodic/aws-ros1-common/default.nix +++ b/melodic/aws-ros1-common/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Common utilities for ROS1 nodes using Amazon Web Services''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/backward-ros/default.nix b/melodic/backward-ros/default.nix index c2e3a20b7c..980e65e078 100644 --- a/melodic/backward-ros/default.nix +++ b/melodic/backward-ros/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The backward_ros package is a ros wrapper of backward-cpp from https://github.com/bombela/backward-cpp''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/bagger/default.nix b/melodic/bagger/default.nix index fcd9c85da5..0772c70129 100644 --- a/melodic/bagger/default.nix +++ b/melodic/bagger/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "e8275de0f4ad29f758472ae12d8ce534b53705ec57066e8611498b6077188226"; }; - buildInputs = [ rostest message-generation roslint std-msgs roscpp ]; + buildInputs = [ roslint rostest message-generation std-msgs roscpp ]; checkInputs = [ nav-msgs geometry-msgs ]; - propagatedBuildInputs = [ rostest message-runtime rospy std-msgs rosbag roscpp ]; + propagatedBuildInputs = [ rosbag rostest message-runtime rospy std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''An application used to systematically record rosbags''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/base-local-planner/default.nix b/melodic/base-local-planner/default.nix index 39b479fa74..36d1f0dab5 100644 --- a/melodic/base-local-planner/default.nix +++ b/melodic/base-local-planner/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rosconsole, rospy, geometry-msgs, voxel-grid, message-generation, message-runtime, angles, tf2-geometry-msgs, catkin, tf2-ros, nav-msgs, std-msgs, visualization-msgs, roscpp, eigen, costmap-2d, cmake-modules, pluginlib, sensor-msgs, nav-core, tf2, dynamic-reconfigure, rosunit }: +{ lib, buildRosPackage, fetchurl, rosconsole, rospy, geometry-msgs, voxel-grid, message-generation, message-runtime, angles, tf2-geometry-msgs, catkin, tf2-ros, nav-msgs, std-msgs, roscpp, visualization-msgs, eigen, costmap-2d, cmake-modules, pluginlib, sensor-msgs, nav-core, tf2, dynamic-reconfigure, rosunit }: buildRosPackage { pname = "ros-melodic-base-local-planner"; version = "1.16.2"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "1c14d73638bd309260ffb06d9a97853ab875b6ab6d6e6723ca8398f6ae0d58a8"; }; - buildInputs = [ rosconsole tf2-geometry-msgs tf2-ros nav-msgs rospy std-msgs dynamic-reconfigure roscpp visualization-msgs geometry-msgs eigen costmap-2d cmake-modules pluginlib sensor-msgs nav-core tf2 voxel-grid message-generation angles ]; + buildInputs = [ rosconsole rospy geometry-msgs voxel-grid message-generation angles tf2-geometry-msgs tf2-ros nav-msgs std-msgs visualization-msgs roscpp eigen costmap-2d cmake-modules pluginlib sensor-msgs nav-core tf2 dynamic-reconfigure ]; checkInputs = [ rosunit ]; propagatedBuildInputs = [ costmap-2d rosconsole pluginlib sensor-msgs nav-core tf2-ros rospy tf2 voxel-grid nav-msgs message-runtime visualization-msgs dynamic-reconfigure std-msgs angles roscpp geometry-msgs eigen ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package provides implementations of the Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane. Given a plan to follow and a costmap, the controller produces velocity commands to send to a mobile base. This package supports both holonomic and non-holonomic robots, any robot footprint that can be represented as a convex polygon or circle, and exposes its configuration as ROS parameters that can be set in a launch file. This package's ROS wrapper adheres to the BaseLocalPlanner interface specified in the nav_core package.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/bayesian-belief-networks/default.nix b/melodic/bayesian-belief-networks/default.nix index d1b86eee43..5118fff22a 100644 --- a/melodic/bayesian-belief-networks/default.nix +++ b/melodic/bayesian-belief-networks/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "0c8068d7e845e580945f2bad1b3944b43bec26cb1623a3834081dc85d90250dc"; }; - buildInputs = [ message-generation rospy std-msgs mk git ]; + buildInputs = [ mk git message-generation rospy std-msgs ]; propagatedBuildInputs = [ std-msgs message-runtime rospy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The bayesian_belief_networks package form https://github.com/eBay/bayesian-belief-networks, Authored by Neville Newey, Anzar Afaq, Copyright 2013 eBay Software Foundation''; - #license = lib.licenses.Apache License, Version 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/behaviortree-cpp-v3/default.nix b/melodic/behaviortree-cpp-v3/default.nix index 2d0afaeeb6..0c4941ee4a 100644 --- a/melodic/behaviortree-cpp-v3/default.nix +++ b/melodic/behaviortree-cpp-v3/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package provides the Behavior Trees core library.''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/behaviortree-cpp/default.nix b/melodic/behaviortree-cpp/default.nix index f06a597318..3e9fef55a6 100644 --- a/melodic/behaviortree-cpp/default.nix +++ b/melodic/behaviortree-cpp/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package provides a behavior trees core.''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/bfl/default.nix b/melodic/bfl/default.nix index 2e4e7ee32e..4859658549 100644 --- a/melodic/bfl/default.nix +++ b/melodic/bfl/default.nix @@ -26,6 +26,6 @@ buildRosPackage { compile the library, because BFL is not available from an OS package manager. This ROS package compiles BFL with the Boost library for matrix operations and random number generation.''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/bond-core/default.nix b/melodic/bond-core/default.nix index 5e04bd0e97..5889222393 100644 --- a/melodic/bond-core/default.nix +++ b/melodic/bond-core/default.nix @@ -20,6 +20,6 @@ buildRosPackage { terminated, either cleanly or by crashing. The bond remains connected until it is either broken explicitly or until a heartbeat times out.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/bond/default.nix b/melodic/bond/default.nix index eb4b43a582..bb8d789985 100644 --- a/melodic/bond/default.nix +++ b/melodic/bond/default.nix @@ -21,6 +21,6 @@ buildRosPackage { terminated, either cleanly or by crashing. The bond remains connected until it is either broken explicitly or until a heartbeat times out.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/bondcpp/default.nix b/melodic/bondcpp/default.nix index 39b87bba6a..e66fbf920e 100644 --- a/melodic/bondcpp/default.nix +++ b/melodic/bondcpp/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''C++ implementation of bond, a mechanism for checking when another process has terminated.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/bondpy/default.nix b/melodic/bondpy/default.nix index 46560f8cc8..8fa56eb4a3 100644 --- a/melodic/bondpy/default.nix +++ b/melodic/bondpy/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Python implementation of bond, a mechanism for checking when another process has terminated.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/brics-actuator/default.nix b/melodic/brics-actuator/default.nix index e53cb9f063..5274faa3fa 100644 --- a/melodic/brics-actuator/default.nix +++ b/melodic/brics-actuator/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message defined in the BRICS project''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/calibration-estimation/default.nix b/melodic/calibration-estimation/default.nix index a99cb08a53..aa35cfe8c2 100644 --- a/melodic/calibration-estimation/default.nix +++ b/melodic/calibration-estimation/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, python-orocos-kdl, sensor-msgs, catkin, pythonPackages, rostest, urdfdom-py, rospy, visualization-msgs, calibration-msgs }: +{ lib, buildRosPackage, fetchurl, calibration-msgs, python-orocos-kdl, sensor-msgs, catkin, pythonPackages, rostest, rospy, visualization-msgs, urdfdom-py }: buildRosPackage { pname = "ros-melodic-calibration-estimation"; version = "0.10.14"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "b6d902974beb94a2868f04a7c820517a153083bf0c316b91036a746a411a2970"; }; - propagatedBuildInputs = [ calibration-msgs python-orocos-kdl sensor-msgs pythonPackages.scipy rostest rospy visualization-msgs pythonPackages.matplotlib urdfdom-py ]; + propagatedBuildInputs = [ python-orocos-kdl sensor-msgs pythonPackages.scipy rostest urdfdom-py rospy visualization-msgs pythonPackages.matplotlib calibration-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Runs an optimization to estimate the a robot's kinematic parameters. This package is a generic rewrite of pr2_calibration_estimation.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/calibration-launch/default.nix b/melodic/calibration-launch/default.nix index a857b1e922..2c5b5669b2 100644 --- a/melodic/calibration-launch/default.nix +++ b/melodic/calibration-launch/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "eaf7a65341c7be0665741f2d6f22d3e9d6a5a50deb004ffd402434fc2ae715b7"; }; - propagatedBuildInputs = [ joint-states-settler laser-cb-detector monocam-settler interval-intersection urdfdom-py ]; + propagatedBuildInputs = [ laser-cb-detector monocam-settler interval-intersection joint-states-settler urdfdom-py ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package contains a collection of launch files that can be helpful in configuring the calibration stack to run on your robot.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/calibration-msgs/default.nix b/melodic/calibration-msgs/default.nix index 5823052c07..ee635cf792 100644 --- a/melodic/calibration-msgs/default.nix +++ b/melodic/calibration-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''This package defines messages for storing calibration samples to be used in full robot calibration procedures. This package is still unstable. Expect the messages to change.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/calibration-setup-helper/default.nix b/melodic/calibration-setup-helper/default.nix index cbc73d962e..0c74e16de7 100644 --- a/melodic/calibration-setup-helper/default.nix +++ b/melodic/calibration-setup-helper/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains a script to generate calibration launch and configurationfiles for your robot. which is based on Michael Ferguson's calibration code''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/calibration/default.nix b/melodic/calibration/default.nix index ebb19068f7..c8e00cbc1c 100644 --- a/melodic/calibration/default.nix +++ b/melodic/calibration/default.nix @@ -19,6 +19,6 @@ buildRosPackage { description = ''Provides a toolchain running through the robot calibration process. This involves capturing calibration data, estimating parameters, and then updating the URDF.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/camera-calibration-parsers/default.nix b/melodic/camera-calibration-parsers/default.nix index a5ed8a0ca8..8239f848f9 100644 --- a/melodic/camera-calibration-parsers/default.nix +++ b/melodic/camera-calibration-parsers/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "dd350061b03da5dba0315515f603daa31204e71c43389cf9e57bf09c06d8d3ef"; }; - buildInputs = [ rosconsole boost roscpp-serialization libyamlcpp sensor-msgs roscpp pkg-config ]; + buildInputs = [ rosconsole boost libyamlcpp sensor-msgs pkg-config roscpp-serialization roscpp ]; checkInputs = [ rosunit rosbash ]; - propagatedBuildInputs = [ boost roscpp-serialization libyamlcpp sensor-msgs roscpp ]; + propagatedBuildInputs = [ boost libyamlcpp sensor-msgs roscpp-serialization roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''camera_calibration_parsers contains routines for reading and writing camera calibration parameters.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/camera-calibration/default.nix b/melodic/camera-calibration/default.nix index 54980bf389..c88ac51f60 100644 --- a/melodic/camera-calibration/default.nix +++ b/melodic/camera-calibration/default.nix @@ -13,12 +13,12 @@ buildRosPackage { }; checkInputs = [ rostest ]; - propagatedBuildInputs = [ std-srvs rospy sensor-msgs cv-bridge message-filters image-geometry ]; + propagatedBuildInputs = [ std-srvs sensor-msgs cv-bridge message-filters image-geometry rospy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''camera_calibration allows easy calibration of monocular or stereo cameras using a checkerboard calibration target.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/camera-info-manager/default.nix b/melodic/camera-info-manager/default.nix index dc0ff4dce8..12c885e02c 100644 --- a/melodic/camera-info-manager/default.nix +++ b/melodic/camera-info-manager/default.nix @@ -12,9 +12,9 @@ buildRosPackage { sha256 = "c24f43db36b8922346fb722119850fdd6a0fafe87fa38521edba5c8c6ed4e98d"; }; - buildInputs = [ rostest roslib boost camera-calibration-parsers image-transport sensor-msgs roscpp ]; + buildInputs = [ boost camera-calibration-parsers image-transport sensor-msgs rostest roslib roscpp ]; checkInputs = [ gtest ]; - propagatedBuildInputs = [ roslib boost camera-calibration-parsers image-transport sensor-msgs roscpp ]; + propagatedBuildInputs = [ boost camera-calibration-parsers image-transport sensor-msgs roslib roscpp ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { information. It provides CameraInfo, and handles SetCameraInfo service requests, saving and restoring the camera calibration data.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/camera-umd/default.nix b/melodic/camera-umd/default.nix index d0f49af164..50917ec576 100644 --- a/melodic/camera-umd/default.nix +++ b/melodic/camera-umd/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''UMD camera metapackage''; - #license = lib.licenses.GPLv2; + license = with lib.licenses; [ gpl2 ]; }; } diff --git a/melodic/can-msgs/default.nix b/melodic/can-msgs/default.nix index e39b0b3449..8b120c0514 100644 --- a/melodic/can-msgs/default.nix +++ b/melodic/can-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''CAN related message types.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/canopen-402/default.nix b/melodic/canopen-402/default.nix index ab6871fdd1..b3951d2865 100644 --- a/melodic/canopen-402/default.nix +++ b/melodic/canopen-402/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This implements the CANopen device profile for drives and motion control. CiA(r) 402''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/canopen-chain-node/default.nix b/melodic/canopen-chain-node/default.nix index 837deee26b..95078e2f78 100644 --- a/melodic/canopen-chain-node/default.nix +++ b/melodic/canopen-chain-node/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, std-srvs, pluginlib, catkin, diagnostic-updater, roslib, message-generation, message-runtime, socketcan-interface, std-msgs, roscpp, canopen-master }: +{ lib, buildRosPackage, fetchurl, std-srvs, pluginlib, catkin, roscpp, diagnostic-updater, message-generation, message-runtime, socketcan-interface, std-msgs, roslib, canopen-master }: buildRosPackage { pname = "ros-melodic-canopen-chain-node"; version = "0.8.0"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "38578e51fcb8c8cf7e3de40d3febe7e318244f107b56346a984c7e5fe1cf9639"; }; - buildInputs = [ std-srvs pluginlib roscpp diagnostic-updater message-generation socketcan-interface std-msgs roslib canopen-master ]; - propagatedBuildInputs = [ std-srvs pluginlib roscpp diagnostic-updater message-runtime socketcan-interface std-msgs roslib canopen-master ]; + buildInputs = [ std-srvs pluginlib diagnostic-updater roslib message-generation socketcan-interface std-msgs roscpp canopen-master ]; + propagatedBuildInputs = [ std-srvs pluginlib diagnostic-updater roslib message-runtime socketcan-interface std-msgs roscpp canopen-master ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Base implementation for CANopen chains node with support for management services and diagnostics''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/canopen-master/default.nix b/melodic/canopen-master/default.nix index 7ce7cd371c..419a5902fc 100644 --- a/melodic/canopen-master/default.nix +++ b/melodic/canopen-master/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''CiA(r) CANopen 301 master implementation with support for interprocess master synchronisation.''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/canopen-motor-node/default.nix b/melodic/canopen-motor-node/default.nix index 47d683fbe1..e45b468d7d 100644 --- a/melodic/canopen-motor-node/default.nix +++ b/melodic/canopen-motor-node/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''canopen_chain_node specialization for handling of canopen_402 motor devices. It facilitates interface abstraction with ros_control.''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/capabilities/default.nix b/melodic/capabilities/default.nix index fc63336d0a..29ef44686b 100644 --- a/melodic/capabilities/default.nix +++ b/melodic/capabilities/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "adfb1e8a3002fcfc90f654c8def944f6cd7a8753b3e908b5760eca786b1546ef"; }; - buildInputs = [ rostest std-srvs message-generation rospy std-msgs roslaunch ]; - checkInputs = [ pythonPackages.mock pythonPackages.coverage pythonPackages.pep8 rosservice geometry-msgs ]; - propagatedBuildInputs = [ std-srvs message-runtime rospy std-msgs bondpy roslaunch nodelet pythonPackages.pyyaml ]; + buildInputs = [ std-srvs rostest message-generation rospy std-msgs roslaunch ]; + checkInputs = [ rosservice pythonPackages.coverage pythonPackages.mock pythonPackages.pep8 geometry-msgs ]; + propagatedBuildInputs = [ std-srvs bondpy pythonPackages.pyyaml message-runtime rospy std-msgs roslaunch nodelet ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Package which implements capabilities, including code to parse capability interface specs, to parse capability provider specs, and implement the capability server.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/carrot-planner/default.nix b/melodic/carrot-planner/default.nix index 8c542bf38a..3c5e5151e9 100644 --- a/melodic/carrot-planner/default.nix +++ b/melodic/carrot-planner/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ costmap-2d pluginlib base-local-planner tf2-geometry-msgs nav-core tf2-ros tf2 eigen roscpp ]; - propagatedBuildInputs = [ tf2 costmap-2d pluginlib base-local-planner eigen nav-core roscpp tf2-ros ]; + propagatedBuildInputs = [ costmap-2d pluginlib base-local-planner nav-core tf2-ros tf2 eigen roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This planner attempts to find a legal place to put a carrot for the robot to follow. It does this by moving back along the vector between the robot and the goal point.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/cartesian-msgs/default.nix b/melodic/cartesian-msgs/default.nix index 1dd9024fba..69a40fdedf 100644 --- a/melodic/cartesian-msgs/default.nix +++ b/melodic/cartesian-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Stream cartesian commands''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/cartographer-ros-msgs/default.nix b/melodic/cartographer-ros-msgs/default.nix index e33d609c27..48d743f110 100644 --- a/melodic/cartographer-ros-msgs/default.nix +++ b/melodic/cartographer-ros-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS messages for the cartographer_ros package.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cartographer-ros/default.nix b/melodic/cartographer-ros/default.nix index ccae84a036..db2c72c72a 100644 --- a/melodic/cartographer-ros/default.nix +++ b/melodic/cartographer-ros/default.nix @@ -12,15 +12,15 @@ buildRosPackage { sha256 = "9e734459067f4d18a9458ad47b0b647c937521e650865a9d68380d4adca57c3b"; }; - buildInputs = [ rosbag tf2-ros pythonPackages.sphinx nav-msgs urdf std-msgs cartographer protobuf roscpp pcl-conversions visualization-msgs geometry-msgs gflags pcl sensor-msgs eigen-conversions cartographer-ros-msgs tf2 message-runtime robot-state-publisher tf2-eigen glog roslaunch roslib gmock ]; + buildInputs = [ pythonPackages.sphinx cartographer pcl-conversions geometry-msgs gflags cartographer-ros-msgs message-runtime robot-state-publisher glog roslaunch eigen-conversions roslib rosbag tf2-ros nav-msgs urdf std-msgs protobuf roscpp visualization-msgs pcl sensor-msgs tf2 tf2-eigen gmock ]; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ rosbag tf2-ros nav-msgs urdf std-msgs cartographer roscpp pcl-conversions visualization-msgs geometry-msgs gflags pcl sensor-msgs eigen-conversions cartographer-ros-msgs tf2 message-runtime robot-state-publisher tf2-eigen glog roslaunch roslib ]; + propagatedBuildInputs = [ cartographer pcl-conversions geometry-msgs gflags cartographer-ros-msgs message-runtime robot-state-publisher glog roslaunch roslib eigen-conversions rosbag tf2-ros nav-msgs urdf std-msgs roscpp visualization-msgs pcl sensor-msgs tf2 tf2-eigen ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Cartographer is a system that provides real-time simultaneous localization and mapping (SLAM) in 2D and 3D across multiple platforms and sensor configurations. This package provides Cartographer's ROS integration.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cartographer-rviz/default.nix b/melodic/cartographer-rviz/default.nix index b4e6a11fa7..98d225a967 100644 --- a/melodic/cartographer-rviz/default.nix +++ b/melodic/cartographer-rviz/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, cartographer-ros, catkin, cartographer-ros-msgs, roslib, rviz, qt5, message-runtime, cartographer, eigen-conversions, roscpp }: +{ lib, buildRosPackage, fetchurl, cartographer-ros, catkin, roscpp, cartographer-ros-msgs, rviz, qt5, message-runtime, cartographer, eigen-conversions, roslib }: buildRosPackage { pname = "ros-melodic-cartographer-rviz"; version = "1.0.0-r1"; @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "4eeb8e97c9723d89c14718afc7d81ce1a0a47d41cd5e1d73a8144865840dc523"; }; - buildInputs = [ cartographer-ros roscpp qt5.qtbase cartographer-ros-msgs rviz message-runtime cartographer eigen-conversions roslib ]; - propagatedBuildInputs = [ cartographer-ros roscpp qt5.qtbase cartographer-ros-msgs rviz message-runtime cartographer eigen-conversions roslib ]; + buildInputs = [ cartographer-ros qt5.qtbase cartographer-ros-msgs roslib rviz message-runtime cartographer eigen-conversions roscpp ]; + propagatedBuildInputs = [ cartographer-ros qt5.qtbase cartographer-ros-msgs roslib rviz message-runtime cartographer eigen-conversions roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Cartographer is a system that provides real-time simultaneous localization and mapping (SLAM) in 2D and 3D across multiple platforms and sensor configurations. This package provides Cartographer's RViz integration.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cartographer/default.nix b/melodic/cartographer/default.nix index 0edd4699ad..60ac23267f 100644 --- a/melodic/cartographer/default.nix +++ b/melodic/cartographer/default.nix @@ -13,13 +13,13 @@ buildRosPackage { }; buildInputs = [ cairo ceres-solver boost gflags lua5 pythonPackages.sphinx glog eigen protobuf gmock ]; - propagatedBuildInputs = [ cairo ceres-solver boost gflags lua5 glog protobuf eigen ]; + propagatedBuildInputs = [ cairo ceres-solver boost gflags lua5 glog eigen protobuf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Cartographer is a system that provides real-time simultaneous localization and mapping (SLAM) in 2D and 3D across multiple platforms and sensor configurations.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/catch-ros/default.nix b/melodic/catch-ros/default.nix index 2d2196dc63..e869814c0e 100644 --- a/melodic/catch-ros/default.nix +++ b/melodic/catch-ros/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS integration for the Catch unit test framework''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/catkin/default.nix b/melodic/catkin/default.nix index 40d784d45c..7441522b40 100644 --- a/melodic/catkin/default.nix +++ b/melodic/catkin/default.nix @@ -14,11 +14,11 @@ buildRosPackage { buildInputs = [ python pythonPackages.catkin-pkg pythonPackages.empy ]; checkInputs = [ pythonPackages.nose pythonPackages.mock ]; - propagatedBuildInputs = [ python pythonPackages.catkin-pkg pythonPackages.nose gtest gmock pythonPackages.empy ]; + propagatedBuildInputs = [ python pythonPackages.nose gtest pythonPackages.catkin-pkg gmock pythonPackages.empy ]; nativeBuildInputs = [ cmake ]; meta = { description = ''Low-level build system macros and infrastructure for ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/checkerboard-detector/default.nix b/melodic/checkerboard-detector/default.nix index bea471de8e..8fa1ffb08b 100644 --- a/melodic/checkerboard-detector/default.nix +++ b/melodic/checkerboard-detector/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "ceea72257d2d72b4e132c9dce6d24a976081fff72abba0b7d607f9803b1bd8ad"; }; - buildInputs = [ rosconsole sensor-msgs cv-bridge message-filters posedetection-msgs roscpp image-geometry tf2 jsk-recognition-msgs dynamic-reconfigure eigen-conversions tf ]; - propagatedBuildInputs = [ rosconsole sensor-msgs cv-bridge message-filters posedetection-msgs roscpp image-geometry tf2 dynamic-tf-publisher jsk-recognition-msgs dynamic-reconfigure eigen-conversions tf ]; + buildInputs = [ rosconsole sensor-msgs cv-bridge posedetection-msgs message-filters roscpp image-geometry tf2 jsk-recognition-msgs dynamic-reconfigure eigen-conversions tf ]; + propagatedBuildInputs = [ rosconsole sensor-msgs cv-bridge posedetection-msgs message-filters roscpp image-geometry tf2 dynamic-tf-publisher jsk-recognition-msgs dynamic-reconfigure eigen-conversions tf ]; nativeBuildInputs = [ catkin ]; meta = { @@ -27,6 +27,6 @@ buildRosPackage {
  • grid%d_size_y - number of checkers in y direction

    • There can be more than one grid%d declared, the numbers should grow consecutively starting at 0.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/chomp-motion-planner/default.nix b/melodic/chomp-motion-planner/default.nix index 84bf08a483..012e5998c2 100644 --- a/melodic/chomp-motion-planner/default.nix +++ b/melodic/chomp-motion-planner/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''chomp_motion_planner''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/cl-tf/default.nix b/melodic/cl-tf/default.nix index 7e6f755113..8b41d954e2 100644 --- a/melodic/cl-tf/default.nix +++ b/melodic/cl-tf/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Client implementation to use TF from Common Lisp''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/cl-tf2/default.nix b/melodic/cl-tf2/default.nix index 8dd262d935..fed15b5dd8 100644 --- a/melodic/cl-tf2/default.nix +++ b/melodic/cl-tf2/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, tf2-msgs, actionlib-lisp, catkin, roslisp, cl-utils, cl-transforms-stamped }: +{ lib, buildRosPackage, fetchurl, tf2-msgs, actionlib-lisp, catkin, roslisp, cl-transforms-stamped, cl-utils }: buildRosPackage { pname = "ros-melodic-cl-tf2"; version = "0.2.10"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "668068f24600290b0c5bc0d773d81ca3115f2085a80c58c6617f5467290b2a52"; }; - propagatedBuildInputs = [ tf2-msgs cl-transforms-stamped actionlib-lisp roslisp cl-utils ]; + propagatedBuildInputs = [ tf2-msgs actionlib-lisp roslisp cl-transforms-stamped cl-utils ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Client implementation to use TF2 from Common Lisp''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/cl-transforms-stamped/default.nix b/melodic/cl-transforms-stamped/default.nix index d1014008b5..ed2435a78a 100644 --- a/melodic/cl-transforms-stamped/default.nix +++ b/melodic/cl-transforms-stamped/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Implementation of TF datatypes''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/cl-transforms/default.nix b/melodic/cl-transforms/default.nix index 2264ef16d6..6d5df38746 100644 --- a/melodic/cl-transforms/default.nix +++ b/melodic/cl-transforms/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Homogeneous transform library for Common Lisp.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/cl-urdf/default.nix b/melodic/cl-urdf/default.nix index 5a48da3be4..ad19f66aac 100644 --- a/melodic/cl-urdf/default.nix +++ b/melodic/cl-urdf/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''cl_urdf''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/cl-utils/default.nix b/melodic/cl-utils/default.nix index edb656eafc..252a4d079a 100644 --- a/melodic/cl-utils/default.nix +++ b/melodic/cl-utils/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Common Lisp utility libraries''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/class-loader/default.nix b/melodic/class-loader/default.nix index 629fb15ca0..0e5d038199 100644 --- a/melodic/class-loader/default.nix +++ b/melodic/class-loader/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The class_loader package is a ROS-independent package for loading plugins during runtime and the foundation of the higher level ROS "pluginlib" library. class_loader utilizes the host operating system's runtime loader to open runtime libraries (e.g. .so/.dll files), introspect the library for exported plugin classes, and allows users to instantiate objects of said exported classes without the explicit declaration (i.e. header file) for those classes.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/clear-costmap-recovery/default.nix b/melodic/clear-costmap-recovery/default.nix index ec45caf8b6..a33524f7ec 100644 --- a/melodic/clear-costmap-recovery/default.nix +++ b/melodic/clear-costmap-recovery/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "9844494fbe4443e201302dfd5a6fae1246fe452f38432696d0613c2405283572"; }; - buildInputs = [ costmap-2d cmake-modules pluginlib eigen nav-core roscpp tf2-ros ]; + buildInputs = [ costmap-2d cmake-modules pluginlib nav-core tf2-ros eigen roscpp ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ costmap-2d pluginlib eigen nav-core roscpp tf2-ros ]; + propagatedBuildInputs = [ costmap-2d pluginlib nav-core tf2-ros eigen roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package provides a recovery behavior for the navigation stack that attempts to clear space by reverting the costmaps used by the navigation stack to the static map outside of a given area.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/cloudwatch-logger/default.nix b/melodic/cloudwatch-logger/default.nix index 5f5851c2ef..cfcb3620c4 100644 --- a/melodic/cloudwatch-logger/default.nix +++ b/melodic/cloudwatch-logger/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''CloudWatch Logger node for publishing logs to AWS CloudWatch Logs''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cloudwatch-logs-common/default.nix b/melodic/cloudwatch-logs-common/default.nix index 8550346aa2..d1391fb195 100644 --- a/melodic/cloudwatch-logs-common/default.nix +++ b/melodic/cloudwatch-logs-common/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''AWS CloudWatch management library used by ROS1/2 node to publish logs to CloudWatch service''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cloudwatch-metrics-collector/default.nix b/melodic/cloudwatch-metrics-collector/default.nix index d6adeba347..ff9423443c 100644 --- a/melodic/cloudwatch-metrics-collector/default.nix +++ b/melodic/cloudwatch-metrics-collector/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "85f807efb7f6dfc6cca35eed12ee12e4bc864e618221903eddab3c28920721cf"; }; - buildInputs = [ aws-common cloudwatch-metrics-common aws-ros1-common ros-monitoring-msgs roscpp ]; + buildInputs = [ cloudwatch-metrics-common ros-monitoring-msgs aws-common aws-ros1-common roscpp ]; checkInputs = [ rostest ]; propagatedBuildInputs = [ aws-ros1-common ros-monitoring-msgs roscpp cloudwatch-metrics-common ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Subscriber node for the aws/monitoring topic to publish metrics to AWS Cloudwatch''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cloudwatch-metrics-common/default.nix b/melodic/cloudwatch-metrics-common/default.nix index 2b1a99c39e..cf3c72387e 100644 --- a/melodic/cloudwatch-metrics-common/default.nix +++ b/melodic/cloudwatch-metrics-common/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Library used by ROS1/2 node to publish metrics''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cmake-modules/default.nix b/melodic/cmake-modules/default.nix index 0dbc20fd08..d7c64eee61 100644 --- a/melodic/cmake-modules/default.nix +++ b/melodic/cmake-modules/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''A common repository for CMake Modules which are not distributed with CMake but are commonly used by ROS packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/cob-actions/default.nix b/melodic/cob-actions/default.nix index 52d1db2ced..0f589030af 100644 --- a/melodic/cob-actions/default.nix +++ b/melodic/cob-actions/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This Package contains Care-O-bot specific action definitions.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cob-common/default.nix b/melodic/cob-common/default.nix index 946427a62e..affb07c5dc 100644 --- a/melodic/cob-common/default.nix +++ b/melodic/cob-common/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "84d1c74ce5aab95a64c655926aef6a9b76df9d5acd2c683fa5319e3015ff4dd6"; }; - propagatedBuildInputs = [ cob-srvs raw-description cob-description cob-actions cob-msgs ]; + propagatedBuildInputs = [ raw-description cob-srvs cob-description cob-actions cob-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The cob_common stack hosts common packages that are used within the Care-O-bot repository. E.g. utility packages or common message and service definitions etc. Also the urdf desciption of the robot is located in this stack.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cob-default-env-config/default.nix b/melodic/cob-default-env-config/default.nix index 4883effc54..741d0ad1a0 100644 --- a/melodic/cob-default-env-config/default.nix +++ b/melodic/cob-default-env-config/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''This package contains configuration files for the default environments for Care-O-bot supported by IPA.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cob-description/default.nix b/melodic/cob-description/default.nix index fb3d14ab89..c77882f1e8 100644 --- a/melodic/cob-description/default.nix +++ b/melodic/cob-description/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "256b6a129e52dacbf23b263cf2eed6f1addf9ec7a718a6f658df8eacd6abb189"; }; - propagatedBuildInputs = [ gazebo-ros rosbash rospy rosunit xacro ]; + propagatedBuildInputs = [ gazebo-ros rosbash xacro rospy rosunit ]; nativeBuildInputs = [ catkin ]; meta = { @@ -20,6 +20,6 @@ buildRosPackage { etc.) of the Care-O-bot robot. The files in this package are parsed and used by a variety of other components. Most users will not interact directly with this package.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cob-environments/default.nix b/melodic/cob-environments/default.nix index 1b86a3115a..d1b0929277 100644 --- a/melodic/cob-environments/default.nix +++ b/melodic/cob-environments/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''This stack holds packages for IPA default environment configuration.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cob-msgs/default.nix b/melodic/cob-msgs/default.nix index d7de7ec31e..9585dd66eb 100644 --- a/melodic/cob-msgs/default.nix +++ b/melodic/cob-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages for representing state information, such as battery information and emergency stop status.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/cob-srvs/default.nix b/melodic/cob-srvs/default.nix index c5395ab8b2..cac1ed61dc 100644 --- a/melodic/cob-srvs/default.nix +++ b/melodic/cob-srvs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This Package contains Care-O-bot specific service definitions.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/code-coverage/default.nix b/melodic/code-coverage/default.nix index 74e3923bc3..21ae914c59 100644 --- a/melodic/code-coverage/default.nix +++ b/melodic/code-coverage/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''CMake configuration to run coverage''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/codec-image-transport/default.nix b/melodic/codec-image-transport/default.nix index f178bca0ca..3b90ae00dd 100644 --- a/melodic/codec-image-transport/default.nix +++ b/melodic/codec-image-transport/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "13bb8181da621d6d7bff7f97900b2bc744a93a4e2c8f5e92030a3e50da2a578c"; }; - buildInputs = [ pluginlib image-transport sensor-msgs roscpp ffmpeg ]; - propagatedBuildInputs = [ pluginlib image-transport sensor-msgs roscpp ffmpeg ]; + buildInputs = [ pluginlib image-transport sensor-msgs ffmpeg roscpp ]; + propagatedBuildInputs = [ pluginlib image-transport sensor-msgs ffmpeg roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The codec_image_transport package''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/combined-robot-hw-tests/default.nix b/melodic/combined-robot-hw-tests/default.nix index ae80bcb1d5..1b4ff48219 100644 --- a/melodic/combined-robot-hw-tests/default.nix +++ b/melodic/combined-robot-hw-tests/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The combined_robot_hw_tests package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/combined-robot-hw/default.nix b/melodic/combined-robot-hw/default.nix index ab9eea8fe8..5537ac0366 100644 --- a/melodic/combined-robot-hw/default.nix +++ b/melodic/combined-robot-hw/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Combined Robot HW class.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/common-msgs/default.nix b/melodic/common-msgs/default.nix index 07498804be..f490e82a77 100644 --- a/melodic/common-msgs/default.nix +++ b/melodic/common-msgs/default.nix @@ -23,6 +23,6 @@ buildRosPackage { geometric primitives (geometry_msgs), robot navigation (nav_msgs), and common sensors (sensor_msgs), such as laser range finders, cameras, point clouds.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/common-tutorials/default.nix b/melodic/common-tutorials/default.nix index 6a15396788..b731adbdcc 100644 --- a/melodic/common-tutorials/default.nix +++ b/melodic/common-tutorials/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Metapackage that contains common tutorials''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/compressed-depth-image-transport/default.nix b/melodic/compressed-depth-image-transport/default.nix index 7ed45c92e8..350973d958 100644 --- a/melodic/compressed-depth-image-transport/default.nix +++ b/melodic/compressed-depth-image-transport/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Compressed_depth_image_transport provides a plugin to image_transport for transparently sending depth images (raw, floating-point) using PNG compression.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/compressed-image-transport/default.nix b/melodic/compressed-image-transport/default.nix index e80fed0475..0c9e84fbfd 100644 --- a/melodic/compressed-image-transport/default.nix +++ b/melodic/compressed-image-transport/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Compressed_image_transport provides a plugin to image_transport for transparently sending images encoded as JPEG or PNG.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/concert-msgs/default.nix b/melodic/concert-msgs/default.nix index 8a8fd8085e..7f08de7b84 100644 --- a/melodic/concert-msgs/default.nix +++ b/melodic/concert-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "2b90b553b2fc831b783dda1382fddbd81c507f33988189768ac44fc0106afac2"; }; - buildInputs = [ uuid-msgs message-generation std-msgs gateway-msgs rocon-app-manager-msgs rocon-std-msgs ]; - propagatedBuildInputs = [ uuid-msgs message-runtime std-msgs gateway-msgs rocon-app-manager-msgs rocon-std-msgs ]; + buildInputs = [ gateway-msgs rocon-app-manager-msgs uuid-msgs message-generation std-msgs rocon-std-msgs ]; + propagatedBuildInputs = [ gateway-msgs rocon-app-manager-msgs uuid-msgs message-runtime std-msgs rocon-std-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Shared communication types for the concert framework.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/concert-service-msgs/default.nix b/melodic/concert-service-msgs/default.nix index e25f9ae649..d46062e86b 100644 --- a/melodic/concert-service-msgs/default.nix +++ b/melodic/concert-service-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages used by official rocon services.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/concert-workflow-engine-msgs/default.nix b/melodic/concert-workflow-engine-msgs/default.nix index e83d353086..e46f376703 100644 --- a/melodic/concert-workflow-engine-msgs/default.nix +++ b/melodic/concert-workflow-engine-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages used by workflow engine''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/control-msgs/default.nix b/melodic/control-msgs/default.nix index 54081347a9..435d71814a 100644 --- a/melodic/control-msgs/default.nix +++ b/melodic/control-msgs/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "12c341b7f245c27bed738494241445879e58aefa0368ba688c67fb114f852d58"; }; - buildInputs = [ message-generation actionlib-msgs std-msgs trajectory-msgs geometry-msgs ]; - propagatedBuildInputs = [ message-runtime actionlib-msgs std-msgs trajectory-msgs geometry-msgs ]; + buildInputs = [ actionlib-msgs trajectory-msgs message-generation std-msgs geometry-msgs ]; + propagatedBuildInputs = [ actionlib-msgs trajectory-msgs message-runtime std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''control_msgs contains base messages and actions useful for controlling robots. It provides representations for controller setpoints and joint and cartesian trajectories.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/control-toolbox/default.nix b/melodic/control-toolbox/default.nix index f10ab076fb..ab82e8fb4e 100644 --- a/melodic/control-toolbox/default.nix +++ b/melodic/control-toolbox/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "87d87fd3110630b61fba232464add3e10dca4f7e6a080cf4900827cccf711c56"; }; - buildInputs = [ message-generation cmake-modules control-msgs dynamic-reconfigure std-msgs realtime-tools roscpp tinyxml ]; + buildInputs = [ cmake-modules control-msgs realtime-tools tinyxml message-generation dynamic-reconfigure std-msgs roscpp ]; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ message-runtime control-msgs dynamic-reconfigure std-msgs realtime-tools roscpp tinyxml ]; + propagatedBuildInputs = [ control-msgs realtime-tools tinyxml message-runtime dynamic-reconfigure std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The control toolbox contains modules that are useful across all controllers.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/controller-interface/default.nix b/melodic/controller-interface/default.nix index ba80eb2a5f..2c263546be 100644 --- a/melodic/controller-interface/default.nix +++ b/melodic/controller-interface/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Interface base class for controllers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/controller-manager-msgs/default.nix b/melodic/controller-manager-msgs/default.nix index 12f19ec302..30329fedd1 100644 --- a/melodic/controller-manager-msgs/default.nix +++ b/melodic/controller-manager-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages and services for the controller manager.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/controller-manager-tests/default.nix b/melodic/controller-manager-tests/default.nix index 10cd307c02..27a5558e12 100644 --- a/melodic/controller-manager-tests/default.nix +++ b/melodic/controller-manager-tests/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''controller_manager_tests''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/controller-manager/default.nix b/melodic/controller-manager/default.nix index accc14457f..4342f1c906 100644 --- a/melodic/controller-manager/default.nix +++ b/melodic/controller-manager/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The controller manager.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/convex-decomposition/default.nix b/melodic/convex-decomposition/default.nix index bce99ddc16..174e793bd3 100644 --- a/melodic/convex-decomposition/default.nix +++ b/melodic/convex-decomposition/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Convex Decomposition Tool for Robot Model''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/costmap-2d/default.nix b/melodic/costmap-2d/default.nix index 1a955c8592..b2ffef8fd5 100644 --- a/melodic/costmap-2d/default.nix +++ b/melodic/costmap-2d/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "187901c824e86f552a2412c712120acad3e06efa0a9c8a44bb8c7d6c0832a1a1"; }; - buildInputs = [ tf2-geometry-msgs tf2-ros nav-msgs std-msgs roscpp visualization-msgs laser-geometry geometry-msgs cmake-modules pluginlib sensor-msgs message-filters tf2-sensor-msgs voxel-grid message-generation rostest tf2 dynamic-reconfigure map-msgs ]; + buildInputs = [ geometry-msgs message-filters tf2-sensor-msgs voxel-grid message-generation tf2-geometry-msgs tf2-ros nav-msgs std-msgs roscpp visualization-msgs laser-geometry cmake-modules pluginlib sensor-msgs rostest tf2 dynamic-reconfigure map-msgs ]; checkInputs = [ rostest rosbag rosunit map-server ]; propagatedBuildInputs = [ pluginlib rosconsole sensor-msgs message-filters tf2-ros rostest tf2 nav-msgs voxel-grid laser-geometry visualization-msgs dynamic-reconfigure std-msgs message-runtime roscpp geometry-msgs map-msgs ]; nativeBuildInputs = [ catkin ]; @@ -25,6 +25,6 @@ buildRosPackage { This package also provides support for map_server based initialization of a costmap, rolling window based costmaps, and parameter based subscription to and configuration of sensor topics.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/costmap-converter/default.nix b/melodic/costmap-converter/default.nix index 7d7c8ae17f..5e3818e5de 100644 --- a/melodic/costmap-converter/default.nix +++ b/melodic/costmap-converter/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "350d4ffc88daa687ea48b4fb8b04889a95b9213f2f5ef676e49ceba9120fc8c7"; }; - buildInputs = [ costmap-2d message-generation pluginlib dynamic-reconfigure std-msgs geometry-msgs cv-bridge roscpp ]; - propagatedBuildInputs = [ costmap-2d cv-bridge pluginlib message-runtime dynamic-reconfigure std-msgs roscpp geometry-msgs ]; + buildInputs = [ costmap-2d pluginlib cv-bridge message-generation dynamic-reconfigure std-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ costmap-2d pluginlib cv-bridge message-runtime dynamic-reconfigure std-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A ros package that includes plugins and nodes to convert occupied costmap2d cells to primitive types.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/costmap-cspace-msgs/default.nix b/melodic/costmap-cspace-msgs/default.nix index c9f2e23380..92c6e83be4 100644 --- a/melodic/costmap-cspace-msgs/default.nix +++ b/melodic/costmap-cspace-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message definitions for costmap_cspace package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/costmap-queue/default.nix b/melodic/costmap-queue/default.nix index 983b917c40..d799658a23 100644 --- a/melodic/costmap-queue/default.nix +++ b/melodic/costmap-queue/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Tool for iterating through the cells of a costmap to find the closest distance to a subset of cells.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/cpp-common/default.nix b/melodic/cpp-common/default.nix index f21b5aade1..4a0aa5d1e0 100644 --- a/melodic/cpp-common/default.nix +++ b/melodic/cpp-common/default.nix @@ -23,6 +23,6 @@ buildRosPackage { backtraces. This package is a component of roscpp.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/cv-bridge/default.nix b/melodic/cv-bridge/default.nix index 0b1437f9a1..6e4117b3f1 100644 --- a/melodic/cv-bridge/default.nix +++ b/melodic/cv-bridge/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "fb812741718a40399f538eaef7c887b79004afcdbe0271b3258c5c8ee9c55023"; }; - buildInputs = [ python rosconsole boost sensor-msgs opencv3 pythonPackages.opencv3 ]; + buildInputs = [ python rosconsole boost sensor-msgs pythonPackages.opencv3 opencv3 ]; checkInputs = [ rostest pythonPackages.numpy ]; - propagatedBuildInputs = [ python rosconsole boost sensor-msgs opencv3 pythonPackages.opencv3 ]; + propagatedBuildInputs = [ python rosconsole boost sensor-msgs pythonPackages.opencv3 opencv3 ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This contains CvBridge, which converts between ROS Image messages and OpenCV images.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dataspeed-can-msg-filters/default.nix b/melodic/dataspeed-can-msg-filters/default.nix index 72e0755209..91f4144e79 100644 --- a/melodic/dataspeed-can-msg-filters/default.nix +++ b/melodic/dataspeed-can-msg-filters/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Time synchronize multiple CAN messages to get a single callback''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dataspeed-can-tools/default.nix b/melodic/dataspeed-can-tools/default.nix index a0ed15a725..18464dc291 100644 --- a/melodic/dataspeed-can-tools/default.nix +++ b/melodic/dataspeed-can-tools/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "164f92e63ab8188d83e4107e9cb19fdf9db3c96a44282ffb85833bc0c58bfb98"; }; - buildInputs = [ std-msgs can-msgs rosbag roslib roscpp ]; + buildInputs = [ rosbag can-msgs roscpp std-msgs roslib ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ std-msgs can-msgs rosbag roslib roscpp ]; + propagatedBuildInputs = [ rosbag can-msgs roscpp std-msgs roslib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''CAN bus introspection''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dataspeed-can-usb/default.nix b/melodic/dataspeed-can-usb/default.nix index 73dbf20ee4..646a737f47 100644 --- a/melodic/dataspeed-can-usb/default.nix +++ b/melodic/dataspeed-can-usb/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "e664af652ae15f28732366c4ced5ee7d6cdb7e16183a5fec6d37c35856515013"; }; - buildInputs = [ roslib lusb nodelet std-msgs can-msgs roscpp ]; + buildInputs = [ lusb can-msgs roscpp nodelet std-msgs roslib ]; checkInputs = [ roslaunch ]; - propagatedBuildInputs = [ lusb std-msgs can-msgs roslaunch nodelet roscpp ]; + propagatedBuildInputs = [ lusb can-msgs nodelet std-msgs roslaunch roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Driver to interface with the Dataspeed Inc. USB CAN Tool''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dataspeed-can/default.nix b/melodic/dataspeed-can/default.nix index 481141fa02..6817d46010 100644 --- a/melodic/dataspeed-can/default.nix +++ b/melodic/dataspeed-can/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''CAN bus tools using Dataspeed hardware''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dataspeed-pds-can/default.nix b/melodic/dataspeed-pds-can/default.nix index b45655c166..b3966f2e8d 100644 --- a/melodic/dataspeed-pds-can/default.nix +++ b/melodic/dataspeed-pds-can/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "9ac85ae64a11d73e1049f6971720e1dddfe9af4548df5ed6cd083d855d60dbd4"; }; - buildInputs = [ dataspeed-pds-msgs roscpp can-msgs nodelet message-filters dataspeed-can-msg-filters ]; + buildInputs = [ can-msgs message-filters dataspeed-can-msg-filters dataspeed-pds-msgs nodelet roscpp ]; checkInputs = [ rostest roslaunch ]; - propagatedBuildInputs = [ dataspeed-can-usb dataspeed-pds-msgs can-msgs roslaunch nodelet message-filters roscpp ]; + propagatedBuildInputs = [ can-msgs message-filters roscpp dataspeed-can-usb dataspeed-pds-msgs roslaunch nodelet ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Interface to the Dataspeed Inc. Power Distribution System (PDS) via CAN''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dataspeed-pds-msgs/default.nix b/melodic/dataspeed-pds-msgs/default.nix index 762a76fbee..ee4391a2d2 100644 --- a/melodic/dataspeed-pds-msgs/default.nix +++ b/melodic/dataspeed-pds-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages for the Dataspeed Inc. Power Distribution System (PDS)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dataspeed-pds-rqt/default.nix b/melodic/dataspeed-pds-rqt/default.nix index 0c41612116..ef98e73469 100644 --- a/melodic/dataspeed-pds-rqt/default.nix +++ b/melodic/dataspeed-pds-rqt/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "e88f4d791492e0e2966a559a4af4e2b676ce72d2710220ee67c939da43e5d186"; }; - buildInputs = [ rqt-gui-py dataspeed-pds-msgs rospy rqt-gui python-qt-binding ]; - propagatedBuildInputs = [ rqt-gui-py dataspeed-pds-msgs rospy rqt-gui python-qt-binding ]; + buildInputs = [ rqt-gui-py rqt-gui dataspeed-pds-msgs rospy python-qt-binding ]; + propagatedBuildInputs = [ rqt-gui-py rqt-gui dataspeed-pds-msgs rospy python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS rqt GUI for the Dataspeed Inc. Power Distribution System (PDS)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dataspeed-pds-scripts/default.nix b/melodic/dataspeed-pds-scripts/default.nix index 1c51ef62ba..4be5671fe2 100644 --- a/melodic/dataspeed-pds-scripts/default.nix +++ b/melodic/dataspeed-pds-scripts/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Test scripts to interface to the Dataspeed Inc. Power Distribution System (PDS)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dataspeed-pds/default.nix b/melodic/dataspeed-pds/default.nix index 3b96cbff01..18b5f64b3c 100644 --- a/melodic/dataspeed-pds/default.nix +++ b/melodic/dataspeed-pds/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Interface to the Dataspeed Inc. Power Distribution System (PDS)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dataspeed-ulc-can/default.nix b/melodic/dataspeed-ulc-can/default.nix index 607e681c12..c3bc470b46 100644 --- a/melodic/dataspeed-ulc-can/default.nix +++ b/melodic/dataspeed-ulc-can/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "85673897676564ab1aea0ffe505a10469008d058ca28ce81bce53b50b4641813"; }; - buildInputs = [ nodelet dataspeed-ulc-msgs std-msgs can-msgs roscpp geometry-msgs ]; + buildInputs = [ dataspeed-ulc-msgs can-msgs nodelet std-msgs roscpp geometry-msgs ]; checkInputs = [ rostest roslib ]; - propagatedBuildInputs = [ nodelet dataspeed-ulc-msgs std-msgs can-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ dataspeed-ulc-msgs can-msgs nodelet std-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Package to translate ROS messages to and from CAN messages to interact with the Universal Lat/Lon Controller (ULC) firmware''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dataspeed-ulc-msgs/default.nix b/melodic/dataspeed-ulc-msgs/default.nix index 8d074b2ee6..b14e6d23a9 100644 --- a/melodic/dataspeed-ulc-msgs/default.nix +++ b/melodic/dataspeed-ulc-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS messages for interacting with the Universal Lat/Lon Controller (ULC)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dataspeed-ulc/default.nix b/melodic/dataspeed-ulc/default.nix index 7c074def18..be5a534ff9 100644 --- a/melodic/dataspeed-ulc/default.nix +++ b/melodic/dataspeed-ulc/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''CAN interface to the Universal Lat/Lon Controller (ULC) firmware''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dbw-fca-can/default.nix b/melodic/dbw-fca-can/default.nix index 373d05459c..31d4cad1db 100644 --- a/melodic/dbw-fca-can/default.nix +++ b/melodic/dbw-fca-can/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "6551ac4ef59f8aa4a27cc762f1ba9dba24a9f61f28cf8f49b53496d95b2eee91"; }; - buildInputs = [ dbw-fca-msgs rospy std-msgs can-msgs sensor-msgs nodelet geometry-msgs roscpp ]; + buildInputs = [ dbw-fca-msgs sensor-msgs can-msgs roscpp rospy std-msgs nodelet geometry-msgs ]; checkInputs = [ roslaunch ]; - propagatedBuildInputs = [ dbw-fca-msgs sensor-msgs dbw-fca-description can-msgs roscpp dataspeed-can-usb dataspeed-ulc-can rospy std-msgs roslaunch nodelet geometry-msgs ]; + propagatedBuildInputs = [ dbw-fca-msgs sensor-msgs can-msgs roscpp dataspeed-can-usb dataspeed-ulc-can nodelet rospy std-msgs roslaunch dbw-fca-description geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Drive-by-wire interface to the Dataspeed Inc. Chrysler Pacifica DBW kit''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dbw-fca-description/default.nix b/melodic/dbw-fca-description/default.nix index 34bdadb490..d65d7ece0b 100644 --- a/melodic/dbw-fca-description/default.nix +++ b/melodic/dbw-fca-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''URDF and meshes describing the Chrysler Pacifica.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dbw-fca-joystick-demo/default.nix b/melodic/dbw-fca-joystick-demo/default.nix index ece328a155..7855552faa 100644 --- a/melodic/dbw-fca-joystick-demo/default.nix +++ b/melodic/dbw-fca-joystick-demo/default.nix @@ -14,11 +14,11 @@ buildRosPackage { buildInputs = [ std-msgs sensor-msgs roscpp dbw-fca-msgs ]; checkInputs = [ roslaunch roslib ]; - propagatedBuildInputs = [ roslaunch dbw-fca-msgs dbw-fca-can std-msgs sensor-msgs joy roscpp ]; + propagatedBuildInputs = [ dbw-fca-msgs sensor-msgs joy dbw-fca-can std-msgs roslaunch roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Demonstration of drive-by-wire with joystick''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dbw-fca-msgs/default.nix b/melodic/dbw-fca-msgs/default.nix index 95f87cd0cd..2d14579164 100644 --- a/melodic/dbw-fca-msgs/default.nix +++ b/melodic/dbw-fca-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Drive-by-wire messages for the Chrysler Pacifica''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dbw-fca/default.nix b/melodic/dbw-fca/default.nix index 868ab48a58..9c952ad031 100644 --- a/melodic/dbw-fca/default.nix +++ b/melodic/dbw-fca/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Drive-by-wire interface to the Dataspeed Inc. Chrysler Pacifica DBW kit''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dbw-mkz-can/default.nix b/melodic/dbw-mkz-can/default.nix index 42a9e450ab..519bedf4e7 100644 --- a/melodic/dbw-mkz-can/default.nix +++ b/melodic/dbw-mkz-can/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, dbw-mkz-msgs, sensor-msgs, can-msgs, catkin, dbw-mkz-description, dataspeed-can-msg-filters, dataspeed-can-usb, dataspeed-ulc-can, nodelet, rospy, std-msgs, roslaunch, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, dbw-mkz-msgs, sensor-msgs, can-msgs, catkin, dbw-mkz-description, dataspeed-can-msg-filters, roscpp, dataspeed-can-usb, dataspeed-ulc-can, rospy, std-msgs, roslaunch, nodelet, geometry-msgs }: buildRosPackage { pname = "ros-melodic-dbw-mkz-can"; version = "1.1.1"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "912edcf6f79ab86b6040b97bab30c9804b42d7694b41d4c58f2e300df70600e4"; }; - buildInputs = [ dbw-mkz-msgs sensor-msgs can-msgs dataspeed-can-msg-filters nodelet rospy std-msgs roscpp geometry-msgs ]; + buildInputs = [ dbw-mkz-msgs sensor-msgs can-msgs dataspeed-can-msg-filters roscpp rospy std-msgs nodelet geometry-msgs ]; checkInputs = [ roslaunch ]; propagatedBuildInputs = [ dbw-mkz-msgs sensor-msgs can-msgs dbw-mkz-description roscpp dataspeed-can-usb dataspeed-ulc-can rospy std-msgs roslaunch nodelet geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Drive-by-wire interface to the Dataspeed Inc. Lincoln MKZ DBW kit''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dbw-mkz-description/default.nix b/melodic/dbw-mkz-description/default.nix index de19e9fa24..747fe4be12 100644 --- a/melodic/dbw-mkz-description/default.nix +++ b/melodic/dbw-mkz-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''URDF and meshes describing the Lincoln MKZ.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dbw-mkz-joystick-demo/default.nix b/melodic/dbw-mkz-joystick-demo/default.nix index 10803d2a32..8676caf0f3 100644 --- a/melodic/dbw-mkz-joystick-demo/default.nix +++ b/melodic/dbw-mkz-joystick-demo/default.nix @@ -14,11 +14,11 @@ buildRosPackage { buildInputs = [ std-msgs sensor-msgs dbw-mkz-msgs roscpp ]; checkInputs = [ roslaunch roslib ]; - propagatedBuildInputs = [ roslaunch dbw-mkz-msgs dbw-mkz-can std-msgs sensor-msgs joy roscpp ]; + propagatedBuildInputs = [ dbw-mkz-msgs sensor-msgs joy dbw-mkz-can std-msgs roslaunch roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Demonstration of drive-by-wire with joystick''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dbw-mkz-msgs/default.nix b/melodic/dbw-mkz-msgs/default.nix index b38c9f6c06..fdec14742f 100644 --- a/melodic/dbw-mkz-msgs/default.nix +++ b/melodic/dbw-mkz-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Drive-by-wire messages for the Lincoln MKZ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dbw-mkz-twist-controller/default.nix b/melodic/dbw-mkz-twist-controller/default.nix index 7b88142d79..a2f75033e9 100644 --- a/melodic/dbw-mkz-twist-controller/default.nix +++ b/melodic/dbw-mkz-twist-controller/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "cdef1fc782da0f8084335f59afe6d4e49d0415b7e5cbd9c3225cef3a8cfdc126"; }; - buildInputs = [ dbw-mkz-msgs dynamic-reconfigure std-msgs sensor-msgs roscpp geometry-msgs ]; - propagatedBuildInputs = [ dbw-mkz-msgs dynamic-reconfigure std-msgs sensor-msgs roscpp geometry-msgs ]; + buildInputs = [ dbw-mkz-msgs sensor-msgs dynamic-reconfigure std-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ dbw-mkz-msgs sensor-msgs dynamic-reconfigure std-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Twist (speed and angular rate) controller for brake/throttle/steering''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dbw-mkz/default.nix b/melodic/dbw-mkz/default.nix index 132ce3d54a..dfe459c20b 100644 --- a/melodic/dbw-mkz/default.nix +++ b/melodic/dbw-mkz/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Drive-by-wire interface to the Dataspeed Inc. Lincoln MKZ DBW kit''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ddwrt-access-point/default.nix b/melodic/ddwrt-access-point/default.nix index 3a9160e20c..ada2e96adc 100644 --- a/melodic/ddwrt-access-point/default.nix +++ b/melodic/ddwrt-access-point/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''A ROS node that controls a Linksys WRT610Nv2 access point with a dd-wrt firmware. Other access points models/dd-wrt versions may be compatible as long as the web interface is identical.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ddynamic-reconfigure-python/default.nix b/melodic/ddynamic-reconfigure-python/default.nix index e9fca01e2c..e6b9fffade 100644 --- a/melodic/ddynamic-reconfigure-python/default.nix +++ b/melodic/ddynamic-reconfigure-python/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''The ddynamic_reconfigure_python package contains a class to instantiate dynamic reconfigure servers on the fly registering variables''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/default-cfg-fkie/default.nix b/melodic/default-cfg-fkie/default.nix index f1f2e8fb23..528cd78e6b 100644 --- a/melodic/default-cfg-fkie/default.nix +++ b/melodic/default-cfg-fkie/default.nix @@ -5,11 +5,11 @@ { lib, buildRosPackage, fetchurl, catkin, multimaster-msgs-fkie, rospy, roslaunch, roslib }: buildRosPackage { pname = "ros-melodic-default-cfg-fkie"; - version = "0.8.10"; + version = "0.8.12"; src = fetchurl { - url = https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/default_cfg_fkie/0.8.10-0.tar.gz; - sha256 = "597115fae1876c7b86e7aa7f919eb130d9e03bc5ca4978653e2a3d09344b98f2"; + url = https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/default_cfg_fkie/0.8.12-0.tar.gz; + sha256 = "0b43fafcadef2aeff4fd5e7325daac4eeab711e5323c32fb37606bd318f5c7a1"; }; buildInputs = [ multimaster-msgs-fkie ]; @@ -20,6 +20,6 @@ buildRosPackage { description = ''The configuration node loads a given launch configuration and offers services to list or start the contained nodes. It provides additional description extracted from launch file. This is used by node_manager_fkie.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/delphi-esr-msgs/default.nix b/melodic/delphi-esr-msgs/default.nix index 1caaf9abd0..84b1db60e3 100644 --- a/melodic/delphi-esr-msgs/default.nix +++ b/melodic/delphi-esr-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message definitions for the Delphi ESR''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/delphi-mrr-msgs/default.nix b/melodic/delphi-mrr-msgs/default.nix index 76cd6282e3..a82ad3f1d9 100644 --- a/melodic/delphi-mrr-msgs/default.nix +++ b/melodic/delphi-mrr-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message definitions for the Delphi MRR''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 ]; }; } diff --git a/melodic/delphi-srr-msgs/default.nix b/melodic/delphi-srr-msgs/default.nix index 385a7fdfc7..2dd95123dc 100644 --- a/melodic/delphi-srr-msgs/default.nix +++ b/melodic/delphi-srr-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message definitions for the Delphi SRR''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/depth-image-proc/default.nix b/melodic/depth-image-proc/default.nix index 41aa53cb4d..d90bd5e225 100644 --- a/melodic/depth-image-proc/default.nix +++ b/melodic/depth-image-proc/default.nix @@ -14,7 +14,7 @@ buildRosPackage { buildInputs = [ boost cmake-modules image-transport sensor-msgs cv-bridge message-filters tf2-ros image-geometry tf2 eigen-conversions nodelet stereo-msgs ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ tf2 boost nodelet image-transport eigen-conversions cv-bridge tf2-ros image-geometry ]; + propagatedBuildInputs = [ boost image-transport cv-bridge tf2-ros image-geometry tf2 eigen-conversions nodelet ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { produced by OpenNI camera. Functions include creating disparity images and point clouds, as well as registering (reprojecting) a depth image into another camera frame.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/depthcloud-encoder/default.nix b/melodic/depthcloud-encoder/default.nix index d1cddfa8ef..4cd28a9fa5 100644 --- a/melodic/depthcloud-encoder/default.nix +++ b/melodic/depthcloud-encoder/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, image-transport, sensor-msgs, cv-bridge, message-filters, catkin, pcl-ros, dynamic-reconfigure, tf-conversions, roscpp, pcl-conversions }: +{ lib, buildRosPackage, fetchurl, image-transport, sensor-msgs, cv-bridge, message-filters, catkin, pcl-ros, tf-conversions, dynamic-reconfigure, roscpp, pcl-conversions }: buildRosPackage { pname = "ros-melodic-depthcloud-encoder"; version = "0.1.0"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "f057bb543baa3dcb80b740f37262203623e9c9ecbdd5328ce3164dcb667eea39"; }; - buildInputs = [ image-transport pcl-conversions cv-bridge message-filters sensor-msgs dynamic-reconfigure tf-conversions roscpp pcl-ros ]; - propagatedBuildInputs = [ image-transport pcl-conversions cv-bridge message-filters sensor-msgs dynamic-reconfigure tf-conversions roscpp pcl-ros ]; + buildInputs = [ image-transport sensor-msgs cv-bridge message-filters pcl-ros dynamic-reconfigure tf-conversions roscpp pcl-conversions ]; + propagatedBuildInputs = [ image-transport sensor-msgs cv-bridge message-filters pcl-ros dynamic-reconfigure tf-conversions roscpp pcl-conversions ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Point Cloud Encoder for Web-Based Streaming''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/depthimage-to-laserscan/default.nix b/melodic/depthimage-to-laserscan/default.nix index 73962ab3fe..5e3dacbd44 100644 --- a/melodic/depthimage-to-laserscan/default.nix +++ b/melodic/depthimage-to-laserscan/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "0620a9a74ab3a0601a55d1cbe593abe68bbc838ea3fb6a1dfa57ac7e6e3c10ca"; }; - buildInputs = [ dynamic-reconfigure image-transport gtest nodelet sensor-msgs roscpp image-geometry ]; - propagatedBuildInputs = [ dynamic-reconfigure image-transport sensor-msgs nodelet roscpp image-geometry ]; + buildInputs = [ image-transport gtest sensor-msgs roscpp image-geometry dynamic-reconfigure nodelet ]; + propagatedBuildInputs = [ image-transport sensor-msgs roscpp image-geometry dynamic-reconfigure nodelet ]; nativeBuildInputs = [ catkin ]; meta = { description = ''depthimage_to_laserscan''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/derived-object-msgs/default.nix b/melodic/derived-object-msgs/default.nix index fbed16bbf4..9f8cccc017 100644 --- a/melodic/derived-object-msgs/default.nix +++ b/melodic/derived-object-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Abstracted Messages from Perception Modalities''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/desistek-saga-control/default.nix b/melodic/desistek-saga-control/default.nix index e764147dd6..3f555acc3c 100644 --- a/melodic/desistek-saga-control/default.nix +++ b/melodic/desistek-saga-control/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Configuration and launch files to control the Desistek SAGA ROV''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/desistek-saga-description/default.nix b/melodic/desistek-saga-description/default.nix index 0c8d57fbc1..9a0d5fcb5c 100644 --- a/melodic/desistek-saga-description/default.nix +++ b/melodic/desistek-saga-description/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; checkInputs = [ rostest xacro rosunit ]; - propagatedBuildInputs = [ gazebo-ros uuv-assistants uuv-gazebo-ros-plugins uuv-sensor-ros-plugins robot-state-publisher uuv-descriptions ]; + propagatedBuildInputs = [ gazebo-ros uuv-gazebo-ros-plugins uuv-sensor-ros-plugins uuv-assistants uuv-descriptions robot-state-publisher ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The robot description files for the Desistek SAGA ROV underwater vehicle''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/desistek-saga-gazebo/default.nix b/melodic/desistek-saga-gazebo/default.nix index 555d2437a8..6f9ad89364 100644 --- a/melodic/desistek-saga-gazebo/default.nix +++ b/melodic/desistek-saga-gazebo/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Package with launch files for demonstrations with the Desistek SAGA ROV underwater vehicle''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/desktop-full/default.nix b/melodic/desktop-full/default.nix index d3fe18b8e5..43d39257e5 100644 --- a/melodic/desktop-full/default.nix +++ b/melodic/desktop-full/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A metapackage to aggregate several packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/desktop/default.nix b/melodic/desktop/default.nix index 1c427d0700..c38c3a750d 100644 --- a/melodic/desktop/default.nix +++ b/melodic/desktop/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, visualization-tutorials, roslint, common-tutorials, viz, robot, geometry-tutorials, catkin, angles, urdf-tutorial, ros-tutorials }: +{ lib, buildRosPackage, fetchurl, visualization-tutorials, robot, roslint, viz, common-tutorials, geometry-tutorials, catkin, angles, urdf-tutorial, ros-tutorials }: buildRosPackage { pname = "ros-melodic-desktop"; version = "1.4.1"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "4d24671184136e854522257de40f9ce4b618b16ffeaa478f9a25c34d95cd8bc5"; }; - propagatedBuildInputs = [ visualization-tutorials common-tutorials viz robot roslint geometry-tutorials angles urdf-tutorial ros-tutorials ]; + propagatedBuildInputs = [ visualization-tutorials roslint common-tutorials viz robot geometry-tutorials angles urdf-tutorial ros-tutorials ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A metapackage to aggregate several packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/diagnostic-aggregator/default.nix b/melodic/diagnostic-aggregator/default.nix index b97ef76840..5af73f147a 100644 --- a/melodic/diagnostic-aggregator/default.nix +++ b/melodic/diagnostic-aggregator/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "60f22960bd3056e62b0d354e4de2b80c3f5e377e31e330c91d82b0c4dcd8e70c"; }; - buildInputs = [ rostest pluginlib xmlrpcpp rospy bondcpp bondpy roscpp diagnostic-msgs ]; - propagatedBuildInputs = [ pluginlib xmlrpcpp rospy bondcpp bondpy roscpp diagnostic-msgs ]; + buildInputs = [ pluginlib bondcpp bondpy rostest xmlrpcpp rospy diagnostic-msgs roscpp ]; + propagatedBuildInputs = [ pluginlib bondcpp bondpy xmlrpcpp rospy diagnostic-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''diagnostic_aggregator''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/diagnostic-analysis/default.nix b/melodic/diagnostic-analysis/default.nix index 7a45b3fe50..243be32df6 100644 --- a/melodic/diagnostic-analysis/default.nix +++ b/melodic/diagnostic-analysis/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''The diagnostic_analysis package can convert a log of diagnostics data into a series of CSV files. Robot logs are recorded with rosbag, and can be processed offline using the scripts in this package.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/diagnostic-common-diagnostics/default.nix b/melodic/diagnostic-common-diagnostics/default.nix index 123346d80d..d652130ef3 100644 --- a/melodic/diagnostic-common-diagnostics/default.nix +++ b/melodic/diagnostic-common-diagnostics/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ diagnostic-updater rostest rospy ]; - propagatedBuildInputs = [ diagnostic-updater pythonPackages.psutil rospy hddtemp tf ]; + propagatedBuildInputs = [ pythonPackages.psutil diagnostic-updater rospy hddtemp tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''diagnostic_common_diagnostics''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/diagnostic-msgs/default.nix b/melodic/diagnostic-msgs/default.nix index 9afd71243b..531dbfb872 100644 --- a/melodic/diagnostic-msgs/default.nix +++ b/melodic/diagnostic-msgs/default.nix @@ -27,6 +27,6 @@ buildRosPackage { These messages are used for long term logging and will not be changed unless there is a very important reason.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/diagnostic-updater/default.nix b/melodic/diagnostic-updater/default.nix index 0b061d24c7..1e879db59b 100644 --- a/melodic/diagnostic-updater/default.nix +++ b/melodic/diagnostic-updater/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''diagnostic_updater contains tools for easily updating diagnostics. it is commonly used in device drivers to keep track of the status of output topics, device status, etc.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/diagnostics/default.nix b/melodic/diagnostics/default.nix index 3db8a852ee..8c38a304e6 100644 --- a/melodic/diagnostics/default.nix +++ b/melodic/diagnostics/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "dec737018e36952a217efb3fda54489da280470d5230f4a5fa282027317cc03f"; }; - propagatedBuildInputs = [ diagnostic-updater self-test diagnostic-analysis diagnostic-common-diagnostics diagnostic-aggregator ]; + propagatedBuildInputs = [ self-test diagnostic-analysis diagnostic-common-diagnostics diagnostic-updater diagnostic-aggregator ]; nativeBuildInputs = [ catkin ]; meta = { description = ''diagnostics''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/diff-drive-controller/default.nix b/melodic/diff-drive-controller/default.nix index 35d57796f9..7e45b926cf 100644 --- a/melodic/diff-drive-controller/default.nix +++ b/melodic/diff-drive-controller/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "bc06277c71ef12ba835e78b38e48a3f39886aaf0a03d779c99689f1ebea02ff0"; }; - buildInputs = [ nav-msgs urdf controller-interface control-msgs dynamic-reconfigure realtime-tools tf ]; - checkInputs = [ controller-manager rosgraph-msgs rostest std-srvs xacro ]; - propagatedBuildInputs = [ nav-msgs urdf controller-interface control-msgs dynamic-reconfigure realtime-tools tf ]; + buildInputs = [ control-msgs realtime-tools nav-msgs urdf controller-interface dynamic-reconfigure tf ]; + checkInputs = [ controller-manager std-srvs rosgraph-msgs rostest xacro ]; + propagatedBuildInputs = [ control-msgs realtime-tools nav-msgs urdf controller-interface dynamic-reconfigure tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Controller for a differential drive mobile base.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dlux-global-planner/default.nix b/melodic/dlux-global-planner/default.nix index 21b27e695a..0d93779f5c 100644 --- a/melodic/dlux-global-planner/default.nix +++ b/melodic/dlux-global-planner/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Plugin based global planner implementing the nav_core2::GlobalPlanner interface.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dlux-plugins/default.nix b/melodic/dlux-plugins/default.nix index 241f5ceeac..6039cd308d 100644 --- a/melodic/dlux-plugins/default.nix +++ b/melodic/dlux-plugins/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Implementation of dlux_global_planner plugin interfaces.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/downward/default.nix b/melodic/downward/default.nix index 2a34078b63..819fa9f3b9 100644 --- a/melodic/downward/default.nix +++ b/melodic/downward/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, python, catkin, gawk, rostest, flex, cacert, time, bison }: +{ lib, buildRosPackage, fetchurl, python, catkin, rostest, flex, cacert, bison, time, gawk }: buildRosPackage { pname = "ros-melodic-downward"; version = "2.1.11"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "b06efbb17bc894b2ef72322de07a90355e9ac920005108b5a7db654b0cfdf043"; }; - buildInputs = [ python rostest flex gawk cacert time bison ]; + buildInputs = [ python gawk rostest flex cacert time bison ]; propagatedBuildInputs = [ time gawk ]; nativeBuildInputs = [ catkin ]; meta = { description = ''fast downward: PDDL Planner (http://www.fast-downward.org)''; - #license = lib.licenses.GPL; + license = with lib.licenses; [ gpl1 ]; }; } diff --git a/melodic/driver-base/default.nix b/melodic/driver-base/default.nix index 7cc470216b..84f4e81185 100644 --- a/melodic/driver-base/default.nix +++ b/melodic/driver-base/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "8f279b3f0297b7798e82dd8d88949507d9dfa4dc58641d6c8d7ec66f65a70c19"; }; - buildInputs = [ diagnostic-updater message-generation self-test dynamic-reconfigure std-msgs roscpp ]; - propagatedBuildInputs = [ diagnostic-updater message-runtime self-test dynamic-reconfigure std-msgs roscpp ]; + buildInputs = [ self-test diagnostic-updater message-generation dynamic-reconfigure std-msgs roscpp ]; + propagatedBuildInputs = [ self-test diagnostic-updater message-runtime dynamic-reconfigure std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A framework for writing drivers that helps with runtime reconfiguration, diagnostics and self-test. This package is deprecated.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/driver-common/default.nix b/melodic/driver-common/default.nix index 6d63b11646..f59c79f42d 100644 --- a/melodic/driver-common/default.nix +++ b/melodic/driver-common/default.nix @@ -23,6 +23,6 @@ buildRosPackage { (retries, error handling, etc.) and interface timestamp_tools: Classes to help timestamp hardware events''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dwa-local-planner/default.nix b/melodic/dwa-local-planner/default.nix index 92f4394cec..96a4ed811d 100644 --- a/melodic/dwa-local-planner/default.nix +++ b/melodic/dwa-local-planner/default.nix @@ -13,7 +13,7 @@ buildRosPackage { }; buildInputs = [ costmap-2d cmake-modules pluginlib tf2-geometry-msgs base-local-planner sensor-msgs nav-core tf2-ros tf2 nav-msgs dynamic-reconfigure angles roscpp eigen ]; - propagatedBuildInputs = [ costmap-2d pluginlib tf2-geometry-msgs base-local-planner sensor-msgs nav-core tf2-ros tf2 nav-msgs dynamic-reconfigure roscpp eigen ]; + propagatedBuildInputs = [ costmap-2d pluginlib base-local-planner tf2-geometry-msgs sensor-msgs nav-core tf2-ros tf2 nav-msgs dynamic-reconfigure roscpp eigen ]; nativeBuildInputs = [ catkin ]; meta = { @@ -25,6 +25,6 @@ buildRosPackage { that can be set in a launch file. The parameters for this planner are also dynamically reconfigurable. This package's ROS wrapper adheres to the BaseLocalPlanner interface specified in the nav_core package.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dwb-critics/default.nix b/melodic/dwb-critics/default.nix index eb376d44dd..b4fb0817ff 100644 --- a/melodic/dwb-critics/default.nix +++ b/melodic/dwb-critics/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "42ff253d658b161baff427aa5da4a789f5dcf17d61e316cc8f40bd320ce00a3f"; }; - buildInputs = [ pluginlib nav-grid-iterators sensor-msgs nav-core2 costmap-queue nav-2d-msgs nav-2d-utils angles roscpp dwb-local-planner geometry-msgs ]; + buildInputs = [ pluginlib nav-grid-iterators nav-core2 costmap-queue sensor-msgs nav-2d-msgs nav-2d-utils angles roscpp dwb-local-planner geometry-msgs ]; checkInputs = [ roslint ]; - propagatedBuildInputs = [ pluginlib nav-grid-iterators sensor-msgs nav-core2 costmap-queue nav-2d-msgs nav-2d-utils angles roscpp dwb-local-planner geometry-msgs ]; + propagatedBuildInputs = [ pluginlib nav-grid-iterators nav-core2 costmap-queue sensor-msgs nav-2d-msgs nav-2d-utils angles roscpp dwb-local-planner geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Implementations for dwb_local_planner TrajectoryCritic interface''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dwb-local-planner/default.nix b/melodic/dwb-local-planner/default.nix index 20ebc7d325..3b64405fc5 100644 --- a/melodic/dwb-local-planner/default.nix +++ b/melodic/dwb-local-planner/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Plugin based local planner implementing the nav_core2::LocalPlanner interface.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dwb-msgs/default.nix b/melodic/dwb-msgs/default.nix index 0f9a81776e..e5843e9eb5 100644 --- a/melodic/dwb-msgs/default.nix +++ b/melodic/dwb-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message/Service definitions specifically for the dwb_local_planner''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dwb-plugins/default.nix b/melodic/dwb-plugins/default.nix index 32ca5f9c70..e2afe3aab4 100644 --- a/melodic/dwb-plugins/default.nix +++ b/melodic/dwb-plugins/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "b329ba183c9e033d2b85423f19ebd060d36df1f05ae4d425b46a868ca87900b1"; }; - buildInputs = [ dwb-local-planner nav-2d-utils pluginlib dynamic-reconfigure angles nav-core2 roscpp nav-2d-msgs ]; + buildInputs = [ pluginlib nav-core2 nav-2d-msgs nav-2d-utils dynamic-reconfigure angles roscpp dwb-local-planner ]; checkInputs = [ rostest roslint rosunit ]; - propagatedBuildInputs = [ dwb-local-planner nav-2d-utils pluginlib dynamic-reconfigure angles nav-core2 roscpp nav-2d-msgs ]; + propagatedBuildInputs = [ pluginlib nav-core2 nav-2d-msgs nav-2d-utils dynamic-reconfigure angles roscpp dwb-local-planner ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Standard implementations of the GoalChecker and TrajectoryGenerators for dwb_local_planner''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dynamic-edt-3d/default.nix b/melodic/dynamic-edt-3d/default.nix index 37481c7af0..723381acaf 100644 --- a/melodic/dynamic-edt-3d/default.nix +++ b/melodic/dynamic-edt-3d/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The dynamicEDT3D library implements an inrementally updatable Euclidean distance transform (EDT) in 3D. It comes with a wrapper to use the OctoMap 3D representation and hooks into the change detection of the OctoMap library to propagate changes to the EDT.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dynamic-reconfigure/default.nix b/melodic/dynamic-reconfigure/default.nix index 81f3a523c8..6605d07ecf 100644 --- a/melodic/dynamic-reconfigure/default.nix +++ b/melodic/dynamic-reconfigure/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "00811c7ff7a43ff5dc2d22ce9bb493e55728d403f49c359606e173b687872151"; }; - buildInputs = [ rostest message-generation boost cpp-common roscpp-serialization std-msgs roscpp ]; - propagatedBuildInputs = [ roslib message-runtime boost rospy std-msgs roscpp rosservice ]; + buildInputs = [ boost cpp-common rostest message-generation roscpp-serialization std-msgs roscpp ]; + propagatedBuildInputs = [ boost rosservice roslib message-runtime rospy std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This unary stack contains the dynamic_reconfigure package which provides a means to change node parameters at any time without having to restart the node.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dynamic-robot-state-publisher/default.nix b/melodic/dynamic-robot-state-publisher/default.nix index 3798ad70db..2a86af7840 100644 --- a/melodic/dynamic-robot-state-publisher/default.nix +++ b/melodic/dynamic-robot-state-publisher/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "d31428da9f939d33337bd61e9cefca16a4d820d208c3d75637999dc912d6629e"; }; - buildInputs = [ kdl-parser robot-state-publisher dynamic-reconfigure sensor-msgs roscpp ]; - propagatedBuildInputs = [ kdl-parser robot-state-publisher dynamic-reconfigure sensor-msgs roscpp ]; + buildInputs = [ kdl-parser sensor-msgs robot-state-publisher dynamic-reconfigure roscpp ]; + propagatedBuildInputs = [ kdl-parser sensor-msgs robot-state-publisher dynamic-reconfigure roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Improved ROS robot_state_publisher which can update the robot model via dynamic_reconfigure.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dynamic-tf-publisher/default.nix b/melodic/dynamic-tf-publisher/default.nix index b56fe53b6e..e92eff542e 100644 --- a/melodic/dynamic-tf-publisher/default.nix +++ b/melodic/dynamic-tf-publisher/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''dynamically set the tf trensformation''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/dynamixel-sdk/default.nix b/melodic/dynamixel-sdk/default.nix index 70e0df4da5..df819abfe5 100644 --- a/melodic/dynamixel-sdk/default.nix +++ b/melodic/dynamixel-sdk/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package is wrapping version of ROBOTIS Dynamxel SDK for ROS. The ROBOTIS Dynamixel SDK, or SDK, is a software development library that provides Dynamixel control functions for packet communication. The API is designed for Dynamixel actuators and Dynamixel-based platforms.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/dynamixel-workbench-controllers/default.nix b/melodic/dynamixel-workbench-controllers/default.nix index 9147fffe00..1e839ddbbe 100644 --- a/melodic/dynamixel-workbench-controllers/default.nix +++ b/melodic/dynamixel-workbench-controllers/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains examples of applying the 'dynamixel_workbench_toolbox' library developed on the basis of dynamixel_sdk to various operating modes of Dynamixel.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/dynamixel-workbench-msgs/default.nix b/melodic/dynamixel-workbench-msgs/default.nix index a90b0673a5..300740fd9e 100644 --- a/melodic/dynamixel-workbench-msgs/default.nix +++ b/melodic/dynamixel-workbench-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package includes ROS messages and services for dynamixel_workbench packages''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/dynamixel-workbench-operators/default.nix b/melodic/dynamixel-workbench-operators/default.nix index 5eaed0aab1..6a86ec116b 100644 --- a/melodic/dynamixel-workbench-operators/default.nix +++ b/melodic/dynamixel-workbench-operators/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains nodes that control the Dynamixel by communicating with the server registered in the 'dynamixel_workbench_controllers' package''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/dynamixel-workbench-single-manager-gui/default.nix b/melodic/dynamixel-workbench-single-manager-gui/default.nix index 57eebe2686..d9586b1719 100644 --- a/melodic/dynamixel-workbench-single-manager-gui/default.nix +++ b/melodic/dynamixel-workbench-single-manager-gui/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ roscpp dynamixel-workbench-msgs dynamixel-workbench-toolbox qt5.qtbase ]; - propagatedBuildInputs = [ dynamixel-workbench-msgs dynamixel-workbench-toolbox roscpp qt5.qtbase ]; + propagatedBuildInputs = [ roscpp dynamixel-workbench-msgs dynamixel-workbench-toolbox qt5.qtbase ]; nativeBuildInputs = [ catkin ]; meta = { description = ''It provides a grapic user interface to check the status of Dynamixel and control it before using Dynamixel''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/dynamixel-workbench-single-manager/default.nix b/melodic/dynamixel-workbench-single-manager/default.nix index c500c10e1f..bd5dfa19c5 100644 --- a/melodic/dynamixel-workbench-single-manager/default.nix +++ b/melodic/dynamixel-workbench-single-manager/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package is single manager for a Dynamixel. It provides a terminal environment to check the status of Dynamixel and control it before using Dynamixel''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/dynamixel-workbench-toolbox/default.nix b/melodic/dynamixel-workbench-toolbox/default.nix index ad11a2de67..fae76fccb2 100644 --- a/melodic/dynamixel-workbench-toolbox/default.nix +++ b/melodic/dynamixel-workbench-toolbox/default.nix @@ -22,6 +22,6 @@ buildRosPackage { The 'dynamixel_tool' class loads its by model number of Dynamixels. The 'dynamixel_driver' class includes wraped function used in DYNAMIXEL SDK. The 'dynamixel_workbench' class make simple to use Dynamixels''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/dynamixel-workbench/default.nix b/melodic/dynamixel-workbench/default.nix index 279b613b25..b698932f01 100644 --- a/melodic/dynamixel-workbench/default.nix +++ b/melodic/dynamixel-workbench/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "00841253629ace29288f09f2eaeedc1d86eee69657d4b0ac32824b4561f5d574"; }; - propagatedBuildInputs = [ dynamixel-workbench-single-manager dynamixel-workbench-single-manager-gui dynamixel-workbench-toolbox dynamixel-workbench-controllers dynamixel-workbench-operators ]; + propagatedBuildInputs = [ dynamixel-workbench-controllers dynamixel-workbench-single-manager dynamixel-workbench-single-manager-gui dynamixel-workbench-toolbox dynamixel-workbench-operators ]; nativeBuildInputs = [ catkin ]; meta = { @@ -20,6 +20,6 @@ buildRosPackage { This metapackage allows you to easily change the ID, baudrate and operating mode of the Dynamixel. Furthermore, it supports various controllers based on operating mode and Dynamixel SDK. These controllers are commanded by operators.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/easy-markers/default.nix b/melodic/easy-markers/default.nix index 3c947b099f..95d6013131 100644 --- a/melodic/easy-markers/default.nix +++ b/melodic/easy-markers/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "64fea822e5e6ee2d58d4bfbd23519485c3197e5a8a8d74ef97ec91abc5e35088"; }; - buildInputs = [ interactive-markers visualization-msgs rospy tf roslib geometry-msgs ]; - propagatedBuildInputs = [ interactive-markers visualization-msgs rospy tf roslib geometry-msgs ]; + buildInputs = [ roslib interactive-markers visualization-msgs rospy tf geometry-msgs ]; + propagatedBuildInputs = [ roslib interactive-markers visualization-msgs rospy tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Python library to assist in publishing markers easily''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/eca-a9-control/default.nix b/melodic/eca-a9-control/default.nix index 0d5dc929f3..13b00685d8 100644 --- a/melodic/eca-a9-control/default.nix +++ b/melodic/eca-a9-control/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Configuration and launch files to control the ECA A9 AUV''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/eca-a9-description/default.nix b/melodic/eca-a9-description/default.nix index d9545a4286..4b8406ffcd 100644 --- a/melodic/eca-a9-description/default.nix +++ b/melodic/eca-a9-description/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; checkInputs = [ rostest xacro rosunit ]; - propagatedBuildInputs = [ gazebo-ros uuv-assistants uuv-gazebo-ros-plugins uuv-sensor-ros-plugins robot-state-publisher uuv-descriptions ]; + propagatedBuildInputs = [ gazebo-ros uuv-gazebo-ros-plugins uuv-sensor-ros-plugins uuv-assistants uuv-descriptions robot-state-publisher ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Robot description for the ECA A9 AUV''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/eca-a9-gazebo/default.nix b/melodic/eca-a9-gazebo/default.nix index 52972acee6..6412cd0122 100644 --- a/melodic/eca-a9-gazebo/default.nix +++ b/melodic/eca-a9-gazebo/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Package with launch files for demonstrations with the ECA A9 AUV''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/ecl-build/default.nix b/melodic/ecl-build/default.nix index e94263ea1e..958c19e55e 100644 --- a/melodic/ecl-build/default.nix +++ b/melodic/ecl-build/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Collection of cmake/make build tools primarily for ecl development itself, but also contains a few cmake modules useful outside of the ecl.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-command-line/default.nix b/melodic/ecl-command-line/default.nix index 903c3e668d..d8c4a25179 100644 --- a/melodic/ecl-command-line/default.nix +++ b/melodic/ecl-command-line/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Embeds the TCLAP library inside the ecl. This is a very convenient command line parser in templatised c++.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-concepts/default.nix b/melodic/ecl-concepts/default.nix index 5bd325afbf..3a0c26b25a 100644 --- a/melodic/ecl-concepts/default.nix +++ b/melodic/ecl-concepts/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Introduces a compile time concept checking mechanism that can be used most commonly to check for required functionality when passing template arguments.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-config/default.nix b/melodic/ecl-config/default.nix index a57a5e0d77..2da8f9b65b 100644 --- a/melodic/ecl-config/default.nix +++ b/melodic/ecl-config/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''These tools inspect and describe your system with macros, types and functions.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-console/default.nix b/melodic/ecl-console/default.nix index e731e6e225..2950ce14ad 100644 --- a/melodic/ecl-console/default.nix +++ b/melodic/ecl-console/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Color codes for ansii consoles.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-containers/default.nix b/melodic/ecl-containers/default.nix index f836bf724d..2ee515d3fe 100644 --- a/melodic/ecl-containers/default.nix +++ b/melodic/ecl-containers/default.nix @@ -23,6 +23,6 @@ buildRosPackage { Also includes techniques for memory debugging of common problems such as buffer overruns.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-converters-lite/default.nix b/melodic/ecl-converters-lite/default.nix index 60ccba547a..d3507a43f6 100644 --- a/melodic/ecl-converters-lite/default.nix +++ b/melodic/ecl-converters-lite/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''These are a very simple version of some of the functions in ecl_converters suitable for firmware development. That is, there is no use of new, templates or exceptions.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-converters/default.nix b/melodic/ecl-converters/default.nix index d8030011ec..a451167650 100644 --- a/melodic/ecl-converters/default.nix +++ b/melodic/ecl-converters/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "30286767e22011751173f3a7c3d063f26f675e6340cd56765e90853879058909"; }; - buildInputs = [ ecl-exceptions ecl-license ecl-errors ecl-type-traits ecl-concepts ecl-config ecl-mpl ]; - propagatedBuildInputs = [ ecl-exceptions ecl-license ecl-errors ecl-type-traits ecl-concepts ecl-config ecl-mpl ]; + buildInputs = [ ecl-concepts ecl-exceptions ecl-license ecl-errors ecl-type-traits ecl-config ecl-mpl ]; + propagatedBuildInputs = [ ecl-concepts ecl-exceptions ecl-license ecl-errors ecl-type-traits ecl-config ecl-mpl ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { the whole range of fundamental types (e.g. all integers, not just int, unsigned int). They will come as the need arises.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-core-apps/default.nix b/melodic/ecl-core-apps/default.nix index 5a7ee9d1fe..54145da97a 100644 --- a/melodic/ecl-core-apps/default.nix +++ b/melodic/ecl-core-apps/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''This includes a suite of programs demo'ing various aspects of the ecl_core. It also includes various benchmarking and utility programs for use primarily with embedded systems.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-core/default.nix b/melodic/ecl-core/default.nix index ca4592f192..1b8a828439 100644 --- a/melodic/ecl-core/default.nix +++ b/melodic/ecl-core/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "faf777d4df832763a55bb0e32b19e5bc391f094d21aaec4acce62c11ed1695d5"; }; - propagatedBuildInputs = [ ecl-eigen ecl-utilities ecl-streams ecl-sigslots ecl-command-line ecl-threads ecl-containers ecl-exceptions ecl-math ecl-devices ecl-linear-algebra ecl-ipc ecl-converters ecl-formatters ecl-concepts ecl-statistics ecl-geometry ecl-time ecl-type-traits ecl-core-apps ecl-mpl ]; + propagatedBuildInputs = [ ecl-streams ecl-threads ecl-exceptions ecl-linear-algebra ecl-ipc ecl-formatters ecl-concepts ecl-statistics ecl-geometry ecl-type-traits ecl-eigen ecl-utilities ecl-sigslots ecl-command-line ecl-containers ecl-math ecl-devices ecl-converters ecl-time ecl-core-apps ecl-mpl ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A set of tools and interfaces extending the capabilities of c++ to provide a lightweight, consistent interface with a focus for control programming.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-devices/default.nix b/melodic/ecl-devices/default.nix index c178058609..833d75ec67 100644 --- a/melodic/ecl-devices/default.nix +++ b/melodic/ecl-devices/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "8fdd41c3aab78f532ddc8c228da3778ecdcb64e8a566952f1ec9dc4f026ba144"; }; - buildInputs = [ ecl-containers ecl-license ecl-utilities ecl-errors ecl-type-traits ecl-mpl ecl-config ecl-threads ]; - propagatedBuildInputs = [ ecl-containers ecl-license ecl-utilities ecl-errors ecl-type-traits ecl-mpl ecl-config ecl-threads ]; + buildInputs = [ ecl-utilities ecl-threads ecl-containers ecl-license ecl-errors ecl-type-traits ecl-config ecl-mpl ]; + propagatedBuildInputs = [ ecl-utilities ecl-threads ecl-containers ecl-license ecl-errors ecl-type-traits ecl-config ecl-mpl ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Provides an extensible and standardised framework for input-output devices.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-eigen/default.nix b/melodic/ecl-eigen/default.nix index bc78f24132..2f3eb10806 100644 --- a/melodic/ecl-eigen/default.nix +++ b/melodic/ecl-eigen/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This provides an Eigen implementation for ecl's linear algebra.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-errors/default.nix b/melodic/ecl-errors/default.nix index 10a355d421..cd8811c556 100644 --- a/melodic/ecl-errors/default.nix +++ b/melodic/ecl-errors/default.nix @@ -21,6 +21,6 @@ buildRosPackage { It includes c style error functions as well as a few useful macros. For higher level mechanisms, refer to ecl_exceptions.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-exceptions/default.nix b/melodic/ecl-exceptions/default.nix index b0309396b5..61c44abab0 100644 --- a/melodic/ecl-exceptions/default.nix +++ b/melodic/ecl-exceptions/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Template based exceptions - these are simple and practical and avoid the proliferation of exception types. Although not syntatactically ideal, it is convenient and eminently practical.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-filesystem/default.nix b/melodic/ecl-filesystem/default.nix index d440e3eedc..80e9bc0579 100644 --- a/melodic/ecl-filesystem/default.nix +++ b/melodic/ecl-filesystem/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "7cc4e4aa69ad033c120e3642f512750348e6a15ca373c585e9d3e56a2b75973f"; }; - buildInputs = [ ecl-exceptions ecl-license ecl-errors ecl-config ecl-build ]; - propagatedBuildInputs = [ ecl-exceptions ecl-license ecl-errors ecl-config ecl-build ]; + buildInputs = [ ecl-build ecl-exceptions ecl-license ecl-errors ecl-config ]; + propagatedBuildInputs = [ ecl-build ecl-exceptions ecl-license ecl-errors ecl-config ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Cross platform filesystem utilities (until c++11 makes its way in).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-formatters/default.nix b/melodic/ecl-formatters/default.nix index 7f010a0d86..4ab902e082 100644 --- a/melodic/ecl-formatters/default.nix +++ b/melodic/ecl-formatters/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''The formatters here simply format various input types to a specified text format. They can be used with most streaming types (including both ecl and stl streams).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-geometry/default.nix b/melodic/ecl-geometry/default.nix index c2c207d50d..4291240544 100644 --- a/melodic/ecl-geometry/default.nix +++ b/melodic/ecl-geometry/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Any tools relating to mathematical geometry. Primarily featuring polynomials and interpolations.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-io/default.nix b/melodic/ecl-io/default.nix index c21010782c..ba3187546a 100644 --- a/melodic/ecl-io/default.nix +++ b/melodic/ecl-io/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Most implementations (windows, posix, ...) have slightly different api for low level input-output functions. These are gathered here and re-represented with a cross platform set of functions.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-ipc/default.nix b/melodic/ecl-ipc/default.nix index ec6edf0ca6..912c4be742 100644 --- a/melodic/ecl-ipc/default.nix +++ b/melodic/ecl-ipc/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "35873c953237fc4218b4a354119e76304a5a8aa4c4147e2ccfab5aac4f3bf4dc"; }; - buildInputs = [ ecl-exceptions ecl-build ecl-license ecl-errors ecl-time-lite ecl-config ecl-time ]; - propagatedBuildInputs = [ ecl-exceptions ecl-build ecl-license ecl-errors ecl-time-lite ecl-config ecl-time ]; + buildInputs = [ ecl-time-lite ecl-time ecl-exceptions ecl-build ecl-license ecl-errors ecl-config ]; + propagatedBuildInputs = [ ecl-time-lite ecl-time ecl-exceptions ecl-build ecl-license ecl-errors ecl-config ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { cross platform c++ wrappers around the lower level c api's that handle these mechanisms. These make it not only easier to utilise such mechanisms, but allow it to be done consistently across platforms.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-license/default.nix b/melodic/ecl-license/default.nix index c417b42908..cf6d26cbe4 100644 --- a/melodic/ecl-license/default.nix +++ b/melodic/ecl-license/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Maintains the ecl licenses and also provides an install target for deploying licenses with the ecl libraries.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-linear-algebra/default.nix b/melodic/ecl-linear-algebra/default.nix index 5ff78ef248..f9fdffef42 100644 --- a/melodic/ecl-linear-algebra/default.nix +++ b/melodic/ecl-linear-algebra/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "5e9b99a6c02c0546ffdd155726bb735897f8591739850b9614143d6719e756e6"; }; - buildInputs = [ ecl-exceptions ecl-converters ecl-eigen ecl-license ecl-formatters ecl-math sophus ecl-build ]; - propagatedBuildInputs = [ ecl-exceptions ecl-converters ecl-eigen ecl-license ecl-formatters ecl-math sophus ecl-build ]; + buildInputs = [ ecl-converters ecl-eigen ecl-formatters sophus ecl-build ecl-exceptions ecl-license ecl-math ]; + propagatedBuildInputs = [ ecl-converters ecl-eigen ecl-formatters sophus ecl-build ecl-exceptions ecl-license ecl-math ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Ecl frontend to a linear matrix package (currently eigen).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-lite/default.nix b/melodic/ecl-lite/default.nix index 738190879f..d75dd4263a 100644 --- a/melodic/ecl-lite/default.nix +++ b/melodic/ecl-lite/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "fceacb01c4b94197a2e6f342c6a76f5a9af13273e9cda61c75c4b3702e3aea3f"; }; - propagatedBuildInputs = [ ecl-sigslots-lite ecl-errors ecl-time-lite ecl-io ecl-converters-lite ecl-config ]; + propagatedBuildInputs = [ ecl-time-lite ecl-io ecl-sigslots-lite ecl-errors ecl-converters-lite ecl-config ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Libraries and utilities for embedded and low-level linux development.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-manipulation/default.nix b/melodic/ecl-manipulation/default.nix index 6cd5a974ee..32668a5056 100644 --- a/melodic/ecl-manipulation/default.nix +++ b/melodic/ecl-manipulation/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Includes basic manipulation related structures as well as a few algorithms currently used at Yujin Robot.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-manipulators/default.nix b/melodic/ecl-manipulators/default.nix index aad4bf29bd..4aa208b5db 100644 --- a/melodic/ecl-manipulators/default.nix +++ b/melodic/ecl-manipulators/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "29d59a85307ce361a71f362a25d9b1ff94aaafd5a2df8a51d0659f74d3d735d9"; }; - buildInputs = [ ecl-exceptions ecl-formatters ecl-license ecl-geometry ecl-build ]; - propagatedBuildInputs = [ ecl-exceptions ecl-formatters ecl-license ecl-geometry ecl-build ]; + buildInputs = [ ecl-formatters ecl-geometry ecl-build ecl-exceptions ecl-license ]; + propagatedBuildInputs = [ ecl-formatters ecl-geometry ecl-build ecl-exceptions ecl-license ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Deploys various manipulation algorithms, currently just feedforward filters (interpolations).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-math/default.nix b/melodic/ecl-math/default.nix index 271adcdc91..37bbae8fe0 100644 --- a/melodic/ecl-math/default.nix +++ b/melodic/ecl-math/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package provides simple support to cmath, filling in holes or redefining in a c++ formulation where desirable.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-mobile-robot/default.nix b/melodic/ecl-mobile-robot/default.nix index a7653108f3..f583e9a997 100644 --- a/melodic/ecl-mobile-robot/default.nix +++ b/melodic/ecl-mobile-robot/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "b90849f51b703d6d5c3b246161ad8679bf14b8a27865ae175e9c945fe9edf31e"; }; - buildInputs = [ ecl-license ecl-formatters ecl-errors ecl-math ecl-linear-algebra ecl-geometry ecl-build ]; - propagatedBuildInputs = [ ecl-license ecl-formatters ecl-errors ecl-math ecl-linear-algebra ecl-geometry ecl-build ]; + buildInputs = [ ecl-formatters ecl-geometry ecl-build ecl-license ecl-errors ecl-math ecl-linear-algebra ]; + propagatedBuildInputs = [ ecl-formatters ecl-geometry ecl-build ecl-license ecl-errors ecl-math ecl-linear-algebra ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Contains transforms (e.g. differential drive inverse kinematics) for the various types of mobile robot platforms.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-mpl/default.nix b/melodic/ecl-mpl/default.nix index bc6bcd4eec..46aa4f0591 100644 --- a/melodic/ecl-mpl/default.nix +++ b/melodic/ecl-mpl/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Metaprogramming tools move alot of runtime calculations to be shifted to compile time. This has only very elementary structures at this stage.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-navigation/default.nix b/melodic/ecl-navigation/default.nix index 763d438760..a92a6349d7 100644 --- a/melodic/ecl-navigation/default.nix +++ b/melodic/ecl-navigation/default.nix @@ -20,6 +20,6 @@ buildRosPackage { develop navigation algorithms, in particular slam. It does not focus on the end-point solution, rather the tools needed to create a variety of end-point solutions.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-sigslots-lite/default.nix b/melodic/ecl-sigslots-lite/default.nix index a707acfe76..4a1562ec5c 100644 --- a/melodic/ecl-sigslots-lite/default.nix +++ b/melodic/ecl-sigslots-lite/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''This avoids use of dynamic storage (malloc/new) and thread safety (mutexes) to provide a very simple sigslots implementation that can be used for *very* embedded development.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-sigslots/default.nix b/melodic/ecl-sigslots/default.nix index d0f105a914..986eb01b94 100644 --- a/melodic/ecl-sigslots/default.nix +++ b/melodic/ecl-sigslots/default.nix @@ -22,6 +22,6 @@ buildRosPackage { some improvements - they do not need a preprocessor, are fully type safe, allow for simple connections via a posix style string identifier and are multithread-safe.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-statistics/default.nix b/melodic/ecl-statistics/default.nix index 4bf82a0a13..05cb7bd344 100644 --- a/melodic/ecl-statistics/default.nix +++ b/melodic/ecl-statistics/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Common statistical structures and algorithms for control systems.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-streams/default.nix b/melodic/ecl-streams/default.nix index 1259c782de..bbe648f145 100644 --- a/melodic/ecl-streams/default.nix +++ b/melodic/ecl-streams/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "0fd7c5407bc67d28e90e8bb3cee3850ab90ee195b74703949c991cfc0a5836c3"; }; - buildInputs = [ ecl-converters ecl-license ecl-errors ecl-type-traits ecl-devices ecl-concepts ecl-time ]; - propagatedBuildInputs = [ ecl-converters ecl-license ecl-errors ecl-type-traits ecl-devices ecl-concepts ecl-time ]; + buildInputs = [ ecl-converters ecl-concepts ecl-time ecl-license ecl-errors ecl-type-traits ecl-devices ]; + propagatedBuildInputs = [ ecl-converters ecl-concepts ecl-time ecl-license ecl-errors ecl-type-traits ecl-devices ]; nativeBuildInputs = [ catkin ]; meta = { description = ''These are lightweight text streaming classes that connect to standardised ecl type devices.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-threads/default.nix b/melodic/ecl-threads/default.nix index 4aab19bbb5..a0ffefd053 100644 --- a/melodic/ecl-threads/default.nix +++ b/melodic/ecl-threads/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ecl-utilities, catkin, ecl-concepts, ecl-build, ecl-exceptions, ecl-time, ecl-license, ecl-errors, ecl-config }: +{ lib, buildRosPackage, fetchurl, ecl-utilities, catkin, ecl-concepts, ecl-time, ecl-exceptions, ecl-build, ecl-license, ecl-errors, ecl-config }: buildRosPackage { pname = "ros-melodic-ecl-threads"; version = "0.62.2"; @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "ba9d0e01c8f88af99570d7a92b88a2184521c7c4e4622a440a7ab7eea56af380"; }; - buildInputs = [ ecl-exceptions ecl-build ecl-license ecl-utilities ecl-errors ecl-concepts ecl-config ecl-time ]; - propagatedBuildInputs = [ ecl-exceptions ecl-build ecl-license ecl-utilities ecl-errors ecl-concepts ecl-config ecl-time ]; + buildInputs = [ ecl-utilities ecl-concepts ecl-time ecl-exceptions ecl-build ecl-license ecl-errors ecl-config ]; + propagatedBuildInputs = [ ecl-utilities ecl-concepts ecl-time ecl-exceptions ecl-build ecl-license ecl-errors ecl-config ]; nativeBuildInputs = [ catkin ]; meta = { @@ -21,6 +21,6 @@ buildRosPackage { programming tools. These are usually different on different platforms, so the architecture for a cross-platform framework is also implemented.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-time-lite/default.nix b/melodic/ecl-time-lite/default.nix index 5d06272f73..b701be99e6 100644 --- a/melodic/ecl-time-lite/default.nix +++ b/melodic/ecl-time-lite/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Provides a portable set of time functions that are especially useful for porting other code or being wrapped by higher level c++ classes.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-time/default.nix b/melodic/ecl-time/default.nix index 191c36e879..6722d70306 100644 --- a/melodic/ecl-time/default.nix +++ b/melodic/ecl-time/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "3be2a120f7f4b5a020daac7cc5b8715c2af79c7d2d3c899ac49f2b6640065c04"; }; - buildInputs = [ ecl-exceptions ecl-license ecl-errors ecl-time-lite ecl-config ecl-build ]; - propagatedBuildInputs = [ ecl-exceptions ecl-license ecl-errors ecl-time-lite ecl-config ecl-build ]; + buildInputs = [ ecl-time-lite ecl-build ecl-exceptions ecl-license ecl-errors ecl-config ]; + propagatedBuildInputs = [ ecl-time-lite ecl-build ecl-exceptions ecl-license ecl-errors ecl-config ]; nativeBuildInputs = [ catkin ]; meta = { @@ -23,6 +23,6 @@ buildRosPackage { - posix rt : complete. - macosx : posix timers only, missing absolute timers. - win : none.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-tools/default.nix b/melodic/ecl-tools/default.nix index d6f82ceee0..de416fc9b0 100644 --- a/melodic/ecl-tools/default.nix +++ b/melodic/ecl-tools/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Tools and utilities for ecl development.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-type-traits/default.nix b/melodic/ecl-type-traits/default.nix index 7108430555..0c45e9c603 100644 --- a/melodic/ecl-type-traits/default.nix +++ b/melodic/ecl-type-traits/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Extends c++ type traits and implements a few more to boot.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl-utilities/default.nix b/melodic/ecl-utilities/default.nix index bb376282dc..bbb305fcda 100644 --- a/melodic/ecl-utilities/default.nix +++ b/melodic/ecl-utilities/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Includes various supporting tools and utilities for c++ programming.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ecl/default.nix b/melodic/ecl/default.nix index 8bfe58f71c..61802b2ed2 100644 --- a/melodic/ecl/default.nix +++ b/melodic/ecl/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "bbcf9a596091fbf4158e2593c652fe8329338bcf39ab3258abc93f4ac42289ae"; }; - propagatedBuildInputs = [ ecl-core ecl-lite ecl-manipulation ecl-tools ecl-navigation ]; + propagatedBuildInputs = [ ecl-tools ecl-core ecl-lite ecl-manipulation ecl-navigation ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Metapackage bringing all of ecl together.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/effort-controllers/default.nix b/melodic/effort-controllers/default.nix index 6a1c2f0678..c7ccc57a82 100644 --- a/melodic/effort-controllers/default.nix +++ b/melodic/effort-controllers/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "52db667f0de73f3ceff16dc3ec2d5e5c3b4a1d67ede0c58c89a53883f194821e"; }; - buildInputs = [ realtime-tools urdf controller-interface control-msgs angles control-toolbox forward-command-controller ]; - propagatedBuildInputs = [ realtime-tools urdf controller-interface control-msgs angles control-toolbox forward-command-controller ]; + buildInputs = [ control-msgs control-toolbox realtime-tools controller-interface urdf angles forward-command-controller ]; + propagatedBuildInputs = [ control-msgs control-toolbox realtime-tools controller-interface urdf angles forward-command-controller ]; nativeBuildInputs = [ catkin ]; meta = { description = ''effort_controllers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/eigen-conversions/default.nix b/melodic/eigen-conversions/default.nix index 6b9ef19141..667a1ade15 100644 --- a/melodic/eigen-conversions/default.nix +++ b/melodic/eigen-conversions/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Conversion functions between: - Eigen and KDL - Eigen and geometry_msgs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/eigen-stl-containers/default.nix b/melodic/eigen-stl-containers/default.nix index 0107ee857f..0d5b251ac9 100644 --- a/melodic/eigen-stl-containers/default.nix +++ b/melodic/eigen-stl-containers/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package provides a set of typedef's that allow using Eigen datatypes in STL containers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/eigenpy/default.nix b/melodic/eigenpy/default.nix index ed477b8d4d..517add220b 100644 --- a/melodic/eigenpy/default.nix +++ b/melodic/eigenpy/default.nix @@ -5,19 +5,19 @@ { lib, buildRosPackage, fetchurl, python, boost, git, catkin, pythonPackages, eigen }: buildRosPackage { pname = "ros-melodic-eigenpy"; - version = "1.5.0-r1"; + version = "1.5.1-r2"; src = fetchurl { - url = https://github.com/ipab-slmc/eigenpy_catkin-release/archive/release/melodic/eigenpy/1.5.0-1.tar.gz; - sha256 = "407300df55fa840ad29485ae7f9506e49482bad4b9783aef2bf6d90afe163f4b"; + url = https://github.com/ipab-slmc/eigenpy_catkin-release/archive/release/melodic/eigenpy/1.5.1-2.tar.gz; + sha256 = "c8cf3b85343d3d89898496db8b1f5fcdfc1d3c5c43611cafb1871d7594c21a68"; }; - buildInputs = [ python pythonPackages.numpy boost eigen git ]; + buildInputs = [ python pythonPackages.numpy boost git eigen ]; propagatedBuildInputs = [ python pythonPackages.numpy boost eigen ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Bindings between Numpy and Eigen using Boost.Python - wrapped for catkin.''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/eml/default.nix b/melodic/eml/default.nix index e85d4e65d2..3b84239512 100644 --- a/melodic/eml/default.nix +++ b/melodic/eml/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This is an implementation of the EtherCAT master protocol for the PR2 robot based on the work done at Flanders' Mechatronics Technology Centre.''; - #license = lib.licenses.Binary Only; + license = with lib.licenses; [ "Binary Only" ]; }; } diff --git a/melodic/ethercat-grant/default.nix b/melodic/ethercat-grant/default.nix index cbb43a7ae9..06af06ac21 100644 --- a/melodic/ethercat-grant/default.nix +++ b/melodic/ethercat-grant/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Makes it possible to run the ros_ethercat_loop without using sudo. Forked from pr2-grant''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ethercat-hardware/default.nix b/melodic/ethercat-hardware/default.nix index 9aaaf3cf0a..075251fdb9 100644 --- a/melodic/ethercat-hardware/default.nix +++ b/melodic/ethercat-hardware/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Package for creating a hardware interface to the robot using the EtherCAT motor controller/driver''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ethercat-trigger-controllers/default.nix b/melodic/ethercat-trigger-controllers/default.nix index ed6e44f115..99ae579b3c 100644 --- a/melodic/ethercat-trigger-controllers/default.nix +++ b/melodic/ethercat-trigger-controllers/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "a90e00f501dc42e5a50347e28237683a31cd2d959a2fad379d5bda7706de9aed"; }; - buildInputs = [ message-generation pluginlib pr2-controller-interface std-msgs realtime-tools roscpp libtool diagnostic-msgs ]; + buildInputs = [ pluginlib pr2-controller-interface realtime-tools libtool message-generation std-msgs diagnostic-msgs roscpp ]; propagatedBuildInputs = [ pluginlib pr2-controller-interface realtime-tools libtool message-runtime rospy std-msgs diagnostic-msgs roscpp ]; nativeBuildInputs = [ catkin ]; @@ -20,6 +20,6 @@ buildRosPackage { description = ''Controllers to operate the digital output of the motor controller boards and the projector board. This package has not been reviewed and should be considered unstable.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/eus-assimp/default.nix b/melodic/eus-assimp/default.nix index 25f4d37923..fd013afdf5 100644 --- a/melodic/eus-assimp/default.nix +++ b/melodic/eus-assimp/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''eus_assimp''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/eusurdf/default.nix b/melodic/eusurdf/default.nix index d2eb97c6d6..008b4d8314 100644 --- a/melodic/eusurdf/default.nix +++ b/melodic/eusurdf/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''urdf models converted from euslisp''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/executive-smach-visualization/default.nix b/melodic/executive-smach-visualization/default.nix index 1a286e10a6..f5e08583ec 100644 --- a/melodic/executive-smach-visualization/default.nix +++ b/melodic/executive-smach-visualization/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''This metapackage depends on the SMACH visualization tools.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/executive-smach/default.nix b/melodic/executive-smach/default.nix index 052c629f70..d1d7818664 100644 --- a/melodic/executive-smach/default.nix +++ b/melodic/executive-smach/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This metapackage depends on the SMACH library and ROS SMACH integration packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/exotica-aico-solver/default.nix b/melodic/exotica-aico-solver/default.nix index e2497bed4a..9de9569022 100644 --- a/melodic/exotica-aico-solver/default.nix +++ b/melodic/exotica-aico-solver/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Implementation of the Approximate Inference Control algorithm (AICO)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/exotica-collision-scene-fcl-latest/default.nix b/melodic/exotica-collision-scene-fcl-latest/default.nix index 3a0bb88722..077241f380 100644 --- a/melodic/exotica-collision-scene-fcl-latest/default.nix +++ b/melodic/exotica-collision-scene-fcl-latest/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Collision checking and distance computation using the latest version of the FCL library.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/exotica-core-task-maps/default.nix b/melodic/exotica-core-task-maps/default.nix index 4603ae2e83..2478a71abf 100644 --- a/melodic/exotica-core-task-maps/default.nix +++ b/melodic/exotica-core-task-maps/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Common taskmaps provided with EXOTica.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/exotica-core/default.nix b/melodic/exotica-core/default.nix index 63aafa9825..ab7741a002 100644 --- a/melodic/exotica-core/default.nix +++ b/melodic/exotica-core/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The Extensible Optimization Toolset (EXOTica) is a library for defining problems for robot motion planning.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/exotica-examples/default.nix b/melodic/exotica-examples/default.nix index fec4eca6e6..83e858c256 100644 --- a/melodic/exotica-examples/default.nix +++ b/melodic/exotica-examples/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "29b1331e8e4ea4183064803a44e6e438b638c4d5c1c4927ea3d93d79dd29c325"; }; - buildInputs = [ exotica-ik-solver exotica-python exotica-core exotica-core-task-maps sensor-msgs exotica-aico-solver ]; + buildInputs = [ exotica-ik-solver sensor-msgs exotica-aico-solver exotica-python exotica-core exotica-core-task-maps ]; checkInputs = [ rostest exotica-val-description ]; propagatedBuildInputs = [ exotica-ik-solver geometry-msgs python-orocos-kdl sensor-msgs exotica-time-indexed-rrt-connect-solver exotica-aico-solver exotica-ompl-solver rviz interactive-markers robot-state-publisher visualization-msgs exotica-python exotica-core exotica-core-task-maps exotica-collision-scene-fcl ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Package containing examples and system tests for EXOTica.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/exotica-ik-solver/default.nix b/melodic/exotica-ik-solver/default.nix index c57d3c643b..f8e5cb199e 100644 --- a/melodic/exotica-ik-solver/default.nix +++ b/melodic/exotica-ik-solver/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Pseudo-inverse unconstrained end-pose solver''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/exotica-levenberg-marquardt-solver/default.nix b/melodic/exotica-levenberg-marquardt-solver/default.nix index eedfa176fe..cf5751a7ff 100644 --- a/melodic/exotica-levenberg-marquardt-solver/default.nix +++ b/melodic/exotica-levenberg-marquardt-solver/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''A Levenberg-Marquardt solver for EXOTica''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/exotica-ompl-solver/default.nix b/melodic/exotica-ompl-solver/default.nix index c51d78e284..e2a31b3c16 100644 --- a/melodic/exotica-ompl-solver/default.nix +++ b/melodic/exotica-ompl-solver/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Exotica solvers based on the Open Motion Planning Libary (OMPL)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/exotica-time-indexed-rrt-connect-solver/default.nix b/melodic/exotica-time-indexed-rrt-connect-solver/default.nix index 8574f0e05a..7e1730c041 100644 --- a/melodic/exotica-time-indexed-rrt-connect-solver/default.nix +++ b/melodic/exotica-time-indexed-rrt-connect-solver/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Time-Indexed RRT-Connect solver (Humanoids 2018)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/exotica-val-description/default.nix b/melodic/exotica-val-description/default.nix index b6e16dff8b..a59bf27be8 100644 --- a/melodic/exotica-val-description/default.nix +++ b/melodic/exotica-val-description/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''val_description version including our updated meshes for unit testing and visualisation. Based on the OpenHumanoids fork of the val_description package by NASA JSC. The most current version of the original package can be found at http://gitlab.com/nasa-jsc-robotics/val_description''; - #license = lib.licenses.NASA-1.3; + license = with lib.licenses; [ "NASA-1.3" ]; }; } diff --git a/melodic/exotica/default.nix b/melodic/exotica/default.nix index d27a3699ab..378ccbcdc0 100644 --- a/melodic/exotica/default.nix +++ b/melodic/exotica/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, exotica-ik-solver, catkin, exotica-time-indexed-rrt-connect-solver, exotica-aico-solver, exotica-ompl-solver, exotica-levenberg-marquardt-solver, exotica-python, exotica-collision-scene-fcl-latest, exotica-core, exotica-core-task-maps, exotica-collision-scene-fcl }: +{ lib, buildRosPackage, fetchurl, exotica-ik-solver, catkin, exotica-time-indexed-rrt-connect-solver, exotica-levenberg-marquardt-solver, exotica-ompl-solver, exotica-aico-solver, exotica-python, exotica-collision-scene-fcl-latest, exotica-core, exotica-core-task-maps, exotica-collision-scene-fcl }: buildRosPackage { pname = "ros-melodic-exotica"; version = "5.0.0"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "c765e57dd0796114cc5b4bdaaeb8f8f55dd9311bbcc7320273be1fc4d6dc0d52"; }; - propagatedBuildInputs = [ exotica-ik-solver exotica-time-indexed-rrt-connect-solver exotica-aico-solver exotica-ompl-solver exotica-levenberg-marquardt-solver exotica-python exotica-collision-scene-fcl-latest exotica-core exotica-core-task-maps exotica-collision-scene-fcl ]; + propagatedBuildInputs = [ exotica-ik-solver exotica-time-indexed-rrt-connect-solver exotica-levenberg-marquardt-solver exotica-ompl-solver exotica-aico-solver exotica-python exotica-collision-scene-fcl-latest exotica-core exotica-core-task-maps exotica-collision-scene-fcl ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The Extensible Optimization Toolset (EXOTica) is a library for defining problems for robot motion planning. This package serves similar to a metapackage and contains dependencies onto all core-released exotica packages. It also builds the documentation.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/face-detector/default.nix b/melodic/face-detector/default.nix index dd13029f37..e89c596026 100644 --- a/melodic/face-detector/default.nix +++ b/melodic/face-detector/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "ae5364cd22c42db83150c148f0d9981ff3568b5285630029b87b491f64b6e1a5"; }; - buildInputs = [ std-srvs actionlib-msgs people-msgs rosbag cv-bridge image-geometry actionlib std-msgs rospy roscpp tf geometry-msgs stereo-msgs stereo-image-proc image-transport sensor-msgs message-filters message-generation roslib ]; + buildInputs = [ actionlib-msgs cv-bridge image-geometry actionlib rospy tf geometry-msgs stereo-msgs image-transport message-filters message-generation roslib std-srvs people-msgs rosbag std-msgs roscpp stereo-image-proc sensor-msgs ]; checkInputs = [ rostest stereo-image-proc ]; - propagatedBuildInputs = [ std-srvs actionlib-msgs people-msgs rosbag cv-bridge image-geometry actionlib std-msgs rospy roscpp tf geometry-msgs stereo-msgs stereo-image-proc image-transport sensor-msgs message-filters message-runtime dynamic-reconfigure roslib ]; + propagatedBuildInputs = [ actionlib-msgs cv-bridge image-geometry actionlib rospy tf geometry-msgs stereo-msgs image-transport message-filters message-runtime roslib std-srvs people-msgs rosbag std-msgs roscpp stereo-image-proc sensor-msgs dynamic-reconfigure ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Face detection in images.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fake-localization/default.nix b/melodic/fake-localization/default.nix index 8697e9e991..5e1b497e41 100644 --- a/melodic/fake-localization/default.nix +++ b/melodic/fake-localization/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ rosconsole tf2-geometry-msgs message-filters tf2-ros nav-msgs angles rospy roscpp geometry-msgs ]; - propagatedBuildInputs = [ nav-msgs rosconsole tf2-ros rospy roscpp message-filters geometry-msgs ]; + propagatedBuildInputs = [ rosconsole message-filters tf2-ros nav-msgs rospy roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A ROS node that simply forwards odometry information.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fetch-auto-dock-msgs/default.nix b/melodic/fetch-auto-dock-msgs/default.nix index 8973b3a5ca..c7ee17f3e2 100644 --- a/melodic/fetch-auto-dock-msgs/default.nix +++ b/melodic/fetch-auto-dock-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages for fetch_auto_dock package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fetch-bringup/default.nix b/melodic/fetch-bringup/default.nix index 11b19ca0ef..a82ee8c89b 100644 --- a/melodic/fetch-bringup/default.nix +++ b/melodic/fetch-bringup/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Bringup for fetch''; - #license = lib.licenses.Proprietary; + license = with lib.licenses; [ "Proprietary" ]; }; } diff --git a/melodic/fetch-calibration/default.nix b/melodic/fetch-calibration/default.nix index 69d0a26419..0d1cee3029 100644 --- a/melodic/fetch-calibration/default.nix +++ b/melodic/fetch-calibration/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Launch and configuration files for calibrating Fetch using the 'robot_calibration' package.''; - #license = lib.licenses.Apache2; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/fetch-depth-layer/default.nix b/melodic/fetch-depth-layer/default.nix index e171fa24d2..f380e72df0 100644 --- a/melodic/fetch-depth-layer/default.nix +++ b/melodic/fetch-depth-layer/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The fetch_depth_layer package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fetch-description/default.nix b/melodic/fetch-description/default.nix index e41e582bfe..25edf78255 100644 --- a/melodic/fetch-description/default.nix +++ b/melodic/fetch-description/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''URDF for Fetch Robot.''; - #license = lib.licenses.CreativeCommons-Attribution-NonCommercial-NoDerivatives-4.0; + license = with lib.licenses; [ "CC-BY-NC-ND-4.0" ]; }; } diff --git a/melodic/fetch-driver-msgs/default.nix b/melodic/fetch-driver-msgs/default.nix index f7b158271e..3b2b5122dd 100644 --- a/melodic/fetch-driver-msgs/default.nix +++ b/melodic/fetch-driver-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "aa88a178c8b721288077bbbb32c4bd4ca3b36e3b2cbda1535320326140d82ec5"; }; - buildInputs = [ message-generation actionlib-msgs actionlib std-msgs power-msgs geometry-msgs ]; - propagatedBuildInputs = [ message-runtime actionlib-msgs actionlib std-msgs power-msgs geometry-msgs ]; + buildInputs = [ actionlib-msgs power-msgs message-generation actionlib std-msgs geometry-msgs ]; + propagatedBuildInputs = [ actionlib-msgs power-msgs message-runtime actionlib std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Messages for the fetch_drivers package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fetch-drivers/default.nix b/melodic/fetch-drivers/default.nix index 6316a42d04..48911cc6f5 100644 --- a/melodic/fetch-drivers/default.nix +++ b/melodic/fetch-drivers/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "bf7c846904d5af4fd6cd3591a534d336436666f15b3e1ec28e25d5c5f5c1c241"; }; - buildInputs = [ rospack rosconsole actionlib-msgs mk power-msgs fetch-driver-msgs nav-msgs robot-controllers-interface urdf robot-controllers roscpp-serialization actionlib diagnostic-msgs roscpp robot-calibration-msgs python boost libyamlcpp sensor-msgs urdfdom curl fetch-auto-dock-msgs rostime ]; - propagatedBuildInputs = [ rosconsole actionlib-msgs power-msgs fetch-driver-msgs nav-msgs robot-controllers-interface urdf robot-controllers roscpp-serialization actionlib diagnostic-msgs roscpp robot-calibration-msgs python boost libyamlcpp sensor-msgs urdfdom curl fetch-auto-dock-msgs rostime ]; + buildInputs = [ rosconsole actionlib-msgs fetch-driver-msgs robot-controllers-interface actionlib diagnostic-msgs robot-calibration-msgs boost rostime rospack mk power-msgs nav-msgs urdf robot-controllers roscpp-serialization roscpp python libyamlcpp sensor-msgs urdfdom curl fetch-auto-dock-msgs ]; + propagatedBuildInputs = [ rosconsole actionlib-msgs fetch-driver-msgs robot-controllers-interface actionlib diagnostic-msgs robot-calibration-msgs boost rostime power-msgs nav-msgs urdf robot-controllers roscpp-serialization roscpp python libyamlcpp sensor-msgs urdfdom curl fetch-auto-dock-msgs ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { fetch_drivers contains both the drivers and firmware for the fetch and freight research robots. There should be no reason to use these drivers unless you're running on a fetch or a freight research robot. This package, is a cmake/make only package which installs the binaries for the drivers and firmware.''; - #license = lib.licenses.Proprietary; + license = with lib.licenses; [ "Proprietary" ]; }; } diff --git a/melodic/fetch-gazebo-demo/default.nix b/melodic/fetch-gazebo-demo/default.nix index 82df97f849..2615127d6a 100644 --- a/melodic/fetch-gazebo-demo/default.nix +++ b/melodic/fetch-gazebo-demo/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "07c57825c60fb935a99013eec3b272268a0b4d4564b9d68599dbdf7eff3e5389"; }; - propagatedBuildInputs = [ simple-grasping moveit-commander actionlib moveit-python fetch-gazebo teleop-twist-keyboard fetch-navigation fetch-moveit-config ]; + propagatedBuildInputs = [ simple-grasping moveit-python teleop-twist-keyboard fetch-moveit-config moveit-commander actionlib fetch-navigation fetch-gazebo ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Demos for fetch_gazebo package.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fetch-gazebo/default.nix b/melodic/fetch-gazebo/default.nix index 4c36cd97cf..959e81df98 100644 --- a/melodic/fetch-gazebo/default.nix +++ b/melodic/fetch-gazebo/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "5b623f04b2a527ddd0a1b7407a754a3bb2e024a68f0baee2452dd364f8a95e2f"; }; - buildInputs = [ gazebo-ros boost control-toolbox sensor-msgs gazebo-plugins gazebo-dev robot-controllers-interface robot-controllers angles ]; - propagatedBuildInputs = [ gazebo-ros depth-image-proc boost control-msgs control-toolbox trajectory-msgs gazeboSimulator.gazebo sensor-msgs gazebo-plugins robot-controllers-interface robot-controllers rgbd-launch actionlib fetch-description image-proc nodelet xacro ]; + buildInputs = [ gazebo-ros boost control-toolbox sensor-msgs gazebo-dev gazebo-plugins robot-controllers-interface robot-controllers angles ]; + propagatedBuildInputs = [ gazebo-ros depth-image-proc boost control-msgs trajectory-msgs control-toolbox gazeboSimulator.gazebo sensor-msgs gazebo-plugins robot-controllers-interface robot-controllers rgbd-launch actionlib fetch-description image-proc nodelet xacro ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Gazebo package for Fetch.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fetch-ikfast-plugin/default.nix b/melodic/fetch-ikfast-plugin/default.nix index 2996e595fe..28d57561ed 100644 --- a/melodic/fetch-ikfast-plugin/default.nix +++ b/melodic/fetch-ikfast-plugin/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "62c825a29e1ea77397875b05777eacde641a4a67ceba2c5b2f3ab161effeff67"; }; - buildInputs = [ liblapack moveit-core pluginlib tf2-eigen eigen-conversions roscpp tf2-kdl ]; - propagatedBuildInputs = [ liblapack moveit-core pluginlib eigen-conversions roscpp ]; + buildInputs = [ pluginlib tf2-kdl liblapack moveit-core tf2-eigen eigen-conversions roscpp ]; + propagatedBuildInputs = [ pluginlib liblapack moveit-core eigen-conversions roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Kinematics plugin for Fetch robot, generated through IKFast''; - #license = lib.licenses.Apache2; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/fetch-maps/default.nix b/melodic/fetch-maps/default.nix index c6e0775686..2d52562bb5 100644 --- a/melodic/fetch-maps/default.nix +++ b/melodic/fetch-maps/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''The fetch_maps package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fetch-moveit-config/default.nix b/melodic/fetch-moveit-config/default.nix index a95611304b..399133ac4e 100644 --- a/melodic/fetch-moveit-config/default.nix +++ b/melodic/fetch-moveit-config/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''An automatically generated package with all the configuration and launch files for using the fetch_urdf with the MoveIt Motion Planning Framework''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fetch-navigation/default.nix b/melodic/fetch-navigation/default.nix index 0619854d65..3836a910e6 100644 --- a/melodic/fetch-navigation/default.nix +++ b/melodic/fetch-navigation/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Configuration and launch files for running ROS navigation on Fetch.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fetch-open-auto-dock/default.nix b/melodic/fetch-open-auto-dock/default.nix index 9639f208b5..897c09aeb1 100644 --- a/melodic/fetch-open-auto-dock/default.nix +++ b/melodic/fetch-open-auto-dock/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "73cbede7be9f363559992d9bab141eea8b9c4ac72928fb567e0542cfb0ea7c2a"; }; - buildInputs = [ tf sensor-msgs fetch-driver-msgs roscpp rospy nav-msgs fetch-auto-dock-msgs actionlib std-msgs angles roslib geometry-msgs eigen ]; - propagatedBuildInputs = [ tf fetch-driver-msgs sensor-msgs roscpp rospy nav-msgs fetch-auto-dock-msgs actionlib std-msgs roslib geometry-msgs eigen ]; + buildInputs = [ tf sensor-msgs fetch-driver-msgs roscpp rospy nav-msgs actionlib fetch-auto-dock-msgs std-msgs angles roslib geometry-msgs eigen ]; + propagatedBuildInputs = [ fetch-driver-msgs sensor-msgs roscpp rospy roslib nav-msgs actionlib fetch-auto-dock-msgs std-msgs tf geometry-msgs eigen ]; nativeBuildInputs = [ catkin ]; meta = { description = ''An open-source version of the Fetch charge docking system.''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/fetch-ros/default.nix b/melodic/fetch-ros/default.nix index 6948635391..f63c415144 100644 --- a/melodic/fetch-ros/default.nix +++ b/melodic/fetch-ros/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "8eee5893c1058c6875ca642fa51dcb92bc7a66d0fa2fb5d7aa800f305809819a"; }; - propagatedBuildInputs = [ fetch-teleop fetch-ikfast-plugin fetch-description fetch-navigation fetch-depth-layer fetch-calibration fetch-moveit-config fetch-maps ]; + propagatedBuildInputs = [ fetch-depth-layer fetch-calibration fetch-moveit-config fetch-teleop fetch-ikfast-plugin fetch-description fetch-navigation fetch-maps ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Fetch ROS, packages for working with Fetch and Freight''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fetch-simulation/default.nix b/melodic/fetch-simulation/default.nix index 3f7b8503aa..3cbd0b0d44 100644 --- a/melodic/fetch-simulation/default.nix +++ b/melodic/fetch-simulation/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Fetch Simulation, packages for working with Fetch and Freight in Gazebo''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fetch-teleop/default.nix b/melodic/fetch-teleop/default.nix index 5cd25b0ba4..f08e5ffcff 100644 --- a/melodic/fetch-teleop/default.nix +++ b/melodic/fetch-teleop/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "cfb1141e6a532b67af9d7435c2797936e24fd9d2661a6327a3ad785be4bf33a4"; }; - buildInputs = [ nav-msgs control-msgs actionlib topic-tools sensor-msgs roscpp geometry-msgs ]; - propagatedBuildInputs = [ nav-msgs control-msgs actionlib topic-tools sensor-msgs roscpp geometry-msgs ]; + buildInputs = [ control-msgs sensor-msgs nav-msgs actionlib topic-tools roscpp geometry-msgs ]; + propagatedBuildInputs = [ control-msgs sensor-msgs nav-msgs actionlib topic-tools roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Teleoperation for fetch and freight.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fetchit-challenge/default.nix b/melodic/fetchit-challenge/default.nix index 9d2e264deb..7ae7221ee6 100644 --- a/melodic/fetchit-challenge/default.nix +++ b/melodic/fetchit-challenge/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "0805738f391830e5c290041438956c70fdfa476e0e18535f3797d904bc0e823f"; }; - propagatedBuildInputs = [ gazebo-ros controller-manager robot-state-publisher effort-controllers rospy fetch-gazebo ]; + propagatedBuildInputs = [ gazebo-ros controller-manager effort-controllers robot-state-publisher rospy fetch-gazebo ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The fetchit_challenge package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ff/default.nix b/melodic/ff/default.nix index 6871cef47a..2e033d559f 100644 --- a/melodic/ff/default.nix +++ b/melodic/ff/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''ff: pddl planner. see http://www.loria.fr/~hoffmanj/ff.html''; - #license = lib.licenses.GPL; + license = with lib.licenses; [ gpl1 ]; }; } diff --git a/melodic/ffha/default.nix b/melodic/ffha/default.nix index 013e218aaf..db3c5d1e14 100644 --- a/melodic/ffha/default.nix +++ b/melodic/ffha/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rospack, mk, catkin, rosbuild, gawk, flex, roslib, bison }: +{ lib, buildRosPackage, fetchurl, rospack, mk, catkin, rosbuild, flex, bison, roslib, gawk }: buildRosPackage { pname = "ros-melodic-ffha"; version = "2.1.11"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "416be0691253151483d926b11df4f86f949a4e7e3b10bc505dd467e020c602fa"; }; - buildInputs = [ gawk roslib rospack flex mk rosbuild bison ]; + buildInputs = [ rospack mk rosbuild gawk flex roslib bison ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ffha: PDDL Planner (http://ipc.informatik.uni-freiburg.de)''; - #license = lib.licenses.GPL; + license = with lib.licenses; [ gpl1 ]; }; } diff --git a/melodic/filters/default.nix b/melodic/filters/default.nix index 2473e26804..b898bde65b 100644 --- a/melodic/filters/default.nix +++ b/melodic/filters/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "850380ab0564923c37a6ee93227fe934647a1c4e5dfb4c5d2502f156b6b17d3f"; }; - buildInputs = [ rostest roslib rosconsole pluginlib roscpp ]; + buildInputs = [ rosconsole pluginlib rostest roslib roscpp ]; propagatedBuildInputs = [ rosconsole roslib pluginlib roscpp ]; nativeBuildInputs = [ catkin ]; @@ -20,6 +20,6 @@ buildRosPackage { description = ''This library provides a standardized interface for processing data as a sequence of filters. This package contains a base class upon which to build specific implementations as well as an interface which dynamically loads filters based on runtime parameters.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/find-object-2d/default.nix b/melodic/find-object-2d/default.nix index 1b7cbdc4ad..c843168b64 100644 --- a/melodic/find-object-2d/default.nix +++ b/melodic/find-object-2d/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The find_object_2d package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fingertip-pressure/default.nix b/melodic/fingertip-pressure/default.nix index 1775abc548..8f06e4b6d6 100644 --- a/melodic/fingertip-pressure/default.nix +++ b/melodic/fingertip-pressure/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package provides access to the PR2 fingertip pressure sensors. This information includes:''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/fkie-message-filters/default.nix b/melodic/fkie-message-filters/default.nix index 672a970718..e8a68423b7 100644 --- a/melodic/fkie-message-filters/default.nix +++ b/melodic/fkie-message-filters/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Improved ROS message filters''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/fkie-potree-rviz-plugin/default.nix b/melodic/fkie-potree-rviz-plugin/default.nix index d16f7ac674..2745dca80e 100644 --- a/melodic/fkie-potree-rviz-plugin/default.nix +++ b/melodic/fkie-potree-rviz-plugin/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ jsoncpp rviz boost qt5.qtbase ]; - propagatedBuildInputs = [ rviz boost media-export qt5.qtbase ]; + propagatedBuildInputs = [ media-export rviz boost qt5.qtbase ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Render large point clouds in rviz''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/flatbuffers/default.nix b/melodic/flatbuffers/default.nix index 0e520976d7..f108826b4c 100644 --- a/melodic/flatbuffers/default.nix +++ b/melodic/flatbuffers/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''Google flatbuffers.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/flexbe-behavior-engine/default.nix b/melodic/flexbe-behavior-engine/default.nix index bd0f0bd32e..ccdc30104a 100644 --- a/melodic/flexbe-behavior-engine/default.nix +++ b/melodic/flexbe-behavior-engine/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, flexbe-msgs, flexbe-mirror, catkin, flexbe-states, flexbe-onboard, flexbe-input, flexbe-widget, flexbe-testing, flexbe-core }: +{ lib, buildRosPackage, fetchurl, flexbe-msgs, catkin, flexbe-states, flexbe-onboard, flexbe-core, flexbe-input, flexbe-widget, flexbe-testing, flexbe-mirror }: buildRosPackage { pname = "ros-melodic-flexbe-behavior-engine"; version = "1.1.2"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "3f0feef628758ab5214a812febdc06c807f9a63e347ff60b0e646f137998b68c"; }; - propagatedBuildInputs = [ flexbe-input flexbe-widget flexbe-msgs flexbe-testing flexbe-mirror flexbe-onboard flexbe-states flexbe-core ]; + propagatedBuildInputs = [ flexbe-msgs flexbe-mirror flexbe-states flexbe-onboard flexbe-input flexbe-widget flexbe-testing flexbe-core ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A meta-package to aggregate all the FlexBE packages''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/flexbe-core/default.nix b/melodic/flexbe-core/default.nix index 2dea4a2299..d02014ec09 100644 --- a/melodic/flexbe-core/default.nix +++ b/melodic/flexbe-core/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "f19ccc2536fae3f36bf6b73761b9912e7b9b457ffe973d00574430a33fb123b1"; }; - propagatedBuildInputs = [ flexbe-msgs rospy diagnostic-msgs tf smach-ros ]; + propagatedBuildInputs = [ flexbe-msgs smach-ros rospy diagnostic-msgs tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''flexbe_core provides the core smach extension for the FlexBE behavior engine.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/flexbe-input/default.nix b/melodic/flexbe-input/default.nix index 0ffd5706bd..bfe321e752 100644 --- a/melodic/flexbe-input/default.nix +++ b/melodic/flexbe-input/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''flexbe_input enables to send data to onboard behavior when required.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/flexbe-mirror/default.nix b/melodic/flexbe-mirror/default.nix index 56ceb0516e..6e9b91b7e6 100644 --- a/melodic/flexbe-mirror/default.nix +++ b/melodic/flexbe-mirror/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "e7fe4fb1348f410752aea65dc49ce210fed63260ec504b1a895d9cc131569002"; }; - propagatedBuildInputs = [ flexbe-widget flexbe-msgs rospy smach-ros flexbe-core ]; + propagatedBuildInputs = [ flexbe-msgs smach-ros flexbe-widget rospy flexbe-core ]; nativeBuildInputs = [ catkin ]; meta = { description = ''flexbe_mirror implements functionality to remotely mirror an executed behavior.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/flexbe-msgs/default.nix b/melodic/flexbe-msgs/default.nix index 10dff8cecc..0e17c5b26f 100644 --- a/melodic/flexbe-msgs/default.nix +++ b/melodic/flexbe-msgs/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ message-generation actionlib-msgs actionlib ]; - propagatedBuildInputs = [ actionlib message-runtime actionlib-msgs rospy smach-ros ]; + propagatedBuildInputs = [ actionlib-msgs smach-ros actionlib message-runtime rospy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''flexbe_msgs provides the messages used by FlexBE.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/flexbe-onboard/default.nix b/melodic/flexbe-onboard/default.nix index 82efa04ef9..6913cf1238 100644 --- a/melodic/flexbe-onboard/default.nix +++ b/melodic/flexbe-onboard/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''flexbe_onboard implements the robot-side of the behavior engine from where all behaviors are started.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/flexbe-states/default.nix b/melodic/flexbe-states/default.nix index 0f3c82f113..3077587537 100644 --- a/melodic/flexbe-states/default.nix +++ b/melodic/flexbe-states/default.nix @@ -14,12 +14,12 @@ buildRosPackage { buildInputs = [ rostest ]; checkInputs = [ geometry-msgs ]; - propagatedBuildInputs = [ flexbe-msgs flexbe-testing rospy rosbag smach-ros ]; + propagatedBuildInputs = [ flexbe-msgs rosbag smach-ros flexbe-testing rospy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''flexbe_states provides a collection of predefined states. Feel free to add new states.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/flexbe-testing/default.nix b/melodic/flexbe-testing/default.nix index b84ace60f9..34d93af367 100644 --- a/melodic/flexbe-testing/default.nix +++ b/melodic/flexbe-testing/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''flexbe_testing provides a framework for unit testing states.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/flexbe-widget/default.nix b/melodic/flexbe-widget/default.nix index fd6e5fd75f..3849fcd85d 100644 --- a/melodic/flexbe-widget/default.nix +++ b/melodic/flexbe-widget/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''flexbe_widget implements some smaller scripts for the behavior engine.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/flir-boson-usb/default.nix b/melodic/flir-boson-usb/default.nix index 33085b8978..caa654f82c 100644 --- a/melodic/flir-boson-usb/default.nix +++ b/melodic/flir-boson-usb/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "79c3e1f53669699fa6af61305dd25dfabddbf213bfa36df3b3419950dcf3568f"; }; - buildInputs = [ cv-bridge roslint camera-info-manager image-transport sensor-msgs nodelet roscpp ]; - propagatedBuildInputs = [ cv-bridge camera-info-manager image-transport sensor-msgs nodelet roscpp ]; + buildInputs = [ roslint camera-info-manager image-transport sensor-msgs cv-bridge roscpp nodelet ]; + propagatedBuildInputs = [ camera-info-manager image-transport sensor-msgs cv-bridge roscpp nodelet ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A simple USB camera driver for the FLIR BOSON using OpenCV''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/fmi-adapter-examples/default.nix b/melodic/fmi-adapter-examples/default.nix index 4a5472b7ea..e0321b1ced 100644 --- a/melodic/fmi-adapter-examples/default.nix +++ b/melodic/fmi-adapter-examples/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Provides small examples for use of the fmi_adapter package''; - #license = lib.licenses.Apache License 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/fmi-adapter/default.nix b/melodic/fmi-adapter/default.nix index c68ebf824a..6f3a23a760 100644 --- a/melodic/fmi-adapter/default.nix +++ b/melodic/fmi-adapter/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Wraps FMUs for co-simulation''; - #license = lib.licenses.Apache License 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/force-torque-sensor-controller/default.nix b/melodic/force-torque-sensor-controller/default.nix index ce3dded363..c547c86196 100644 --- a/melodic/force-torque-sensor-controller/default.nix +++ b/melodic/force-torque-sensor-controller/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "5d2aede75983ca4789ab54a5b688500a58decd441e38582bc0d80999ee595786"; }; - buildInputs = [ hardware-interface controller-interface pluginlib realtime-tools roscpp geometry-msgs ]; - propagatedBuildInputs = [ hardware-interface controller-interface pluginlib realtime-tools roscpp geometry-msgs ]; + buildInputs = [ hardware-interface pluginlib realtime-tools controller-interface roscpp geometry-msgs ]; + propagatedBuildInputs = [ hardware-interface pluginlib realtime-tools controller-interface roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Controller to publish state of force-torque sensors''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/forward-command-controller/default.nix b/melodic/forward-command-controller/default.nix index 942bed0170..519dc4cd00 100644 --- a/melodic/forward-command-controller/default.nix +++ b/melodic/forward-command-controller/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''forward_command_controller''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/four-wheel-steering-controller/default.nix b/melodic/four-wheel-steering-controller/default.nix index 5fba3011b2..cd565dbe33 100644 --- a/melodic/four-wheel-steering-controller/default.nix +++ b/melodic/four-wheel-steering-controller/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "bd529d3a98a4ca99a6965a27d09a019ab15fbb247be61246e4c949bed5ae9fcb"; }; - buildInputs = [ nav-msgs controller-interface urdf-geometry-parser realtime-tools tf four-wheel-steering-msgs ]; + buildInputs = [ urdf-geometry-parser realtime-tools nav-msgs controller-interface tf four-wheel-steering-msgs ]; checkInputs = [ controller-manager rostest std-srvs rosgraph-msgs ]; - propagatedBuildInputs = [ nav-msgs controller-interface urdf-geometry-parser realtime-tools tf four-wheel-steering-msgs ]; + propagatedBuildInputs = [ urdf-geometry-parser realtime-tools nav-msgs controller-interface tf four-wheel-steering-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Controller for a four wheel steering mobile base.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/four-wheel-steering-msgs/default.nix b/melodic/four-wheel-steering-msgs/default.nix index 52567b9ac3..38c010645c 100644 --- a/melodic/four-wheel-steering-msgs/default.nix +++ b/melodic/four-wheel-steering-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS messages for robots using FourWheelSteering.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/franka-description/default.nix b/melodic/franka-description/default.nix index d1158ad222..aedc9a212c 100644 --- a/melodic/franka-description/default.nix +++ b/melodic/franka-description/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''franka_description contains URDF files and meshes of Franka Emika robots''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/freight-bringup/default.nix b/melodic/freight-bringup/default.nix index d59eea214f..9d3c317a3d 100644 --- a/melodic/freight-bringup/default.nix +++ b/melodic/freight-bringup/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Bringup for freight''; - #license = lib.licenses.Proprietary; + license = with lib.licenses; [ "Proprietary" ]; }; } diff --git a/melodic/gateway-msgs/default.nix b/melodic/gateway-msgs/default.nix index 5eb6b80de5..cfbdcb5111 100644 --- a/melodic/gateway-msgs/default.nix +++ b/melodic/gateway-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages used by the gateway model.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/gazebo-dev/default.nix b/melodic/gazebo-dev/default.nix index 54009ec297..90a213eeb5 100644 --- a/melodic/gazebo-dev/default.nix +++ b/melodic/gazebo-dev/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Provides a cmake config for the default version of Gazebo for the ROS distribution.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/gazebo-msgs/default.nix b/melodic/gazebo-msgs/default.nix index 5db426abb3..cf3b0014c9 100644 --- a/melodic/gazebo-msgs/default.nix +++ b/melodic/gazebo-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "e0b6c175c51d3fcbe4a2c3143a70a3fc6a209c922c811159a2d5b1922db72426"; }; - buildInputs = [ std-srvs message-generation std-msgs trajectory-msgs sensor-msgs geometry-msgs ]; - propagatedBuildInputs = [ std-srvs message-runtime std-msgs trajectory-msgs sensor-msgs geometry-msgs ]; + buildInputs = [ std-srvs trajectory-msgs sensor-msgs message-generation std-msgs geometry-msgs ]; + propagatedBuildInputs = [ std-srvs trajectory-msgs sensor-msgs message-runtime std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Message and service data structures for interacting with Gazebo from ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/gazebo-plugins/default.nix b/melodic/gazebo-plugins/default.nix index 6e963530b1..9d21f9bb07 100644 --- a/melodic/gazebo-plugins/default.nix +++ b/melodic/gazebo-plugins/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "94c5485bf4de9cbdb17df841f0ba08aa28e245dd533f88c78f3533b763622ca7"; }; - buildInputs = [ std-srvs rosconsole camera-info-manager trajectory-msgs cv-bridge polled-camera tf2-ros gazebo-dev rosgraph-msgs nav-msgs urdf rospy std-msgs dynamic-reconfigure roscpp nodelet tf gazebo-msgs geometry-msgs image-transport sensor-msgs diagnostic-updater message-generation angles ]; + buildInputs = [ rosconsole cv-bridge polled-camera rosgraph-msgs rospy tf gazebo-msgs geometry-msgs image-transport message-generation angles std-srvs camera-info-manager trajectory-msgs tf2-ros gazebo-dev nav-msgs urdf std-msgs roscpp nodelet sensor-msgs diagnostic-updater dynamic-reconfigure ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ std-srvs rosconsole camera-info-manager trajectory-msgs cv-bridge polled-camera tf2-ros gazebo-dev rosgraph-msgs nav-msgs urdf rospy std-msgs dynamic-reconfigure roscpp nodelet tf gazebo-msgs geometry-msgs image-transport sensor-msgs diagnostic-updater message-runtime angles ]; + propagatedBuildInputs = [ rosconsole cv-bridge polled-camera rosgraph-msgs rospy tf gazebo-msgs geometry-msgs image-transport message-runtime angles std-srvs camera-info-manager trajectory-msgs tf2-ros gazebo-dev nav-msgs urdf std-msgs roscpp nodelet sensor-msgs diagnostic-updater dynamic-reconfigure ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components.''; - #license = lib.licenses.BSD, Apache 2.0; + license = with lib.licenses; [ bsd2 ]; }; } diff --git a/melodic/gazebo-ros-control/default.nix b/melodic/gazebo-ros-control/default.nix index 10ca35dcfc..444943edac 100644 --- a/melodic/gazebo-ros-control/default.nix +++ b/melodic/gazebo-ros-control/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''gazebo_ros_control''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/gazebo-ros-pkgs/default.nix b/melodic/gazebo-ros-pkgs/default.nix index e7bc062f67..72b5b86471 100644 --- a/melodic/gazebo-ros-pkgs/default.nix +++ b/melodic/gazebo-ros-pkgs/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Interface for using ROS with the Gazebo simulator.''; - #license = lib.licenses.BSD,LGPL,Apache 2.0; + license = with lib.licenses; [ bsd2 ]; }; } diff --git a/melodic/gazebo-ros/default.nix b/melodic/gazebo-ros/default.nix index 4882a90d8f..928b51185d 100644 --- a/melodic/gazebo-ros/default.nix +++ b/melodic/gazebo-ros/default.nix @@ -13,12 +13,12 @@ buildRosPackage { }; buildInputs = [ std-srvs cmake-modules geometry-msgs tinyxml roscpp gazebo-dev rosgraph-msgs roslib dynamic-reconfigure std-msgs tf gazebo-msgs ]; - propagatedBuildInputs = [ python std-srvs geometry-msgs tf tinyxml roscpp gazebo-dev rosgraph-msgs dynamic-reconfigure std-msgs roslib gazebo-msgs ]; + propagatedBuildInputs = [ python std-srvs geometry-msgs tinyxml roscpp gazebo-dev rosgraph-msgs roslib dynamic-reconfigure std-msgs tf gazebo-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Provides ROS plugins that offer message and service publishers for interfacing with Gazebo through ROS. Formally simulator_gazebo/gazebo''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/gencpp/default.nix b/melodic/gencpp/default.nix index b96fe30420..b097900563 100644 --- a/melodic/gencpp/default.nix +++ b/melodic/gencpp/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''C++ ROS message and service generators.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/generated.nix b/melodic/generated.nix index 2804c0684f..f1cb7033ac 100644 --- a/melodic/generated.nix +++ b/melodic/generated.nix @@ -1,3 +1,7 @@ + +# Copyright 2019 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + self: super: { abseil-cpp = self.callPackage ./abseil-cpp {}; @@ -82,6 +86,8 @@ self: super: { automotive-platform-msgs = self.callPackage ./automotive-platform-msgs {}; + aws-common = self.callPackage ./aws-common {}; + aws-ros1-common = self.callPackage ./aws-ros1-common {}; backward-ros = self.callPackage ./backward-ros {}; @@ -1114,6 +1120,8 @@ self: super: { mk = self.callPackage ./mk {}; + ml-classifiers = self.callPackage ./ml-classifiers {}; + mobileye-560-660-msgs = self.callPackage ./mobileye-560-660-msgs {}; mongodb-log = self.callPackage ./mongodb-log {}; @@ -1704,6 +1712,8 @@ self: super: { rc-cloud-accumulator = self.callPackage ./rc-cloud-accumulator {}; + rc-common-msgs = self.callPackage ./rc-common-msgs {}; + rc-dynamics-api = self.callPackage ./rc-dynamics-api {}; rc-genicam-api = self.callPackage ./rc-genicam-api {}; @@ -2266,6 +2276,8 @@ self: super: { teleop-twist-keyboard = self.callPackage ./teleop-twist-keyboard {}; + teraranger = self.callPackage ./teraranger {}; + test-diagnostic-aggregator = self.callPackage ./test-diagnostic-aggregator {}; test-mavros = self.callPackage ./test-mavros {}; @@ -2570,6 +2582,12 @@ self: super: { webrtc-ros = self.callPackage ./webrtc-ros {}; + wge100-camera = self.callPackage ./wge100-camera {}; + + wge100-camera-firmware = self.callPackage ./wge100-camera-firmware {}; + + wge100-driver = self.callPackage ./wge100-driver {}; + wifi-ddwrt = self.callPackage ./wifi-ddwrt {}; willow-maps = self.callPackage ./willow-maps {}; diff --git a/melodic/geneus/default.nix b/melodic/geneus/default.nix index 3e7bf6dbeb..89ce429527 100644 --- a/melodic/geneus/default.nix +++ b/melodic/geneus/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''EusLisp ROS message and service generators.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/genlisp/default.nix b/melodic/genlisp/default.nix index 416aa7bb4d..d1baf854e9 100644 --- a/melodic/genlisp/default.nix +++ b/melodic/genlisp/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Common-Lisp ROS message and service generators.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/genmsg/default.nix b/melodic/genmsg/default.nix index 1bd0881019..c69f06c356 100644 --- a/melodic/genmsg/default.nix +++ b/melodic/genmsg/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Standalone Python library for generating ROS message and service data structures for various languages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/gennodejs/default.nix b/melodic/gennodejs/default.nix index 5f84d74ad7..efd071c068 100644 --- a/melodic/gennodejs/default.nix +++ b/melodic/gennodejs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Javascript ROS message and service generators.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/genpy/default.nix b/melodic/genpy/default.nix index 7691c53e40..0f4c6eea3c 100644 --- a/melodic/genpy/default.nix +++ b/melodic/genpy/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Python ROS message and service generators.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/geodesy/default.nix b/melodic/geodesy/default.nix index 615eeade45..13964acfe1 100644 --- a/melodic/geodesy/default.nix +++ b/melodic/geodesy/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "58e20388e22a583385b39acf097e80a508617623d484f29a30f31ee96558f58b"; }; - buildInputs = [ uuid-msgs geographic-msgs unique-id angles pythonPackages.catkin-pkg tf sensor-msgs geometry-msgs ]; + buildInputs = [ unique-id sensor-msgs uuid-msgs geographic-msgs angles pythonPackages.catkin-pkg tf geometry-msgs ]; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ uuid-msgs geographic-msgs unique-id tf sensor-msgs pythonPackages.pyproj geometry-msgs ]; + propagatedBuildInputs = [ unique-id tf sensor-msgs uuid-msgs geographic-msgs pythonPackages.pyproj geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Python and C++ interfaces for manipulating geodetic coordinates.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/geographic-info/default.nix b/melodic/geographic-info/default.nix index 066d208fa0..c5610b2586 100644 --- a/melodic/geographic-info/default.nix +++ b/melodic/geographic-info/default.nix @@ -20,6 +20,6 @@ buildRosPackage { Not needed for wet packages, use only to resolve dry stack dependencies.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/geographic-msgs/default.nix b/melodic/geographic-msgs/default.nix index ddaa808cbc..6e39448ed9 100644 --- a/melodic/geographic-msgs/default.nix +++ b/melodic/geographic-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS messages for Geographic Information Systems.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/geometric-shapes/default.nix b/melodic/geometric-shapes/default.nix index 2d73183ae7..aee3b5f257 100644 --- a/melodic/geometric-shapes/default.nix +++ b/melodic/geometric-shapes/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, shape-msgs, boost, eigen-stl-containers, catkin, qhull, random-numbers, pkg-config, assimp, console-bridge, octomap, resource-retriever, eigen, visualization-msgs, rosunit }: +{ lib, buildRosPackage, fetchurl, shape-msgs, boost, eigen-stl-containers, catkin, qhull, random-numbers, assimp, pkg-config, console-bridge, octomap, resource-retriever, eigen, visualization-msgs, rosunit }: buildRosPackage { pname = "ros-melodic-geometric-shapes"; version = "0.6.1"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "d30facbce2033851ba0b121a75c8d41c47a91831e51efb11dafe3bc877a50809"; }; - buildInputs = [ shape-msgs boost eigen-stl-containers qhull random-numbers pkg-config assimp console-bridge octomap resource-retriever eigen visualization-msgs ]; + buildInputs = [ shape-msgs boost eigen-stl-containers qhull random-numbers assimp pkg-config console-bridge octomap resource-retriever eigen visualization-msgs ]; checkInputs = [ rosunit ]; propagatedBuildInputs = [ shape-msgs boost eigen-stl-containers qhull random-numbers assimp console-bridge octomap resource-retriever eigen visualization-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package contains generic definitions of geometric shapes and bodies.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/geometry-msgs/default.nix b/melodic/geometry-msgs/default.nix index d84aa89458..534513e3a5 100644 --- a/melodic/geometry-msgs/default.nix +++ b/melodic/geometry-msgs/default.nix @@ -21,6 +21,6 @@ buildRosPackage { such as points, vectors, and poses. These primitives are designed to provide a common data type and facilitate interoperability throughout the system.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/geometry-tutorials/default.nix b/melodic/geometry-tutorials/default.nix index e8c6ad83d3..eb20c3457d 100644 --- a/melodic/geometry-tutorials/default.nix +++ b/melodic/geometry-tutorials/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Metapackage of geometry tutorials ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/geometry/default.nix b/melodic/geometry/default.nix index 3f8fd489c7..869be31ce8 100644 --- a/melodic/geometry/default.nix +++ b/melodic/geometry/default.nix @@ -20,6 +20,6 @@ buildRosPackage {

    Migration: Since ROS Hydro, tf has been "deprecated" in favor of tf2. tf2 is an iteration on tf providing generally the same feature set more efficiently. As well as adding a few new features.
    As tf2 is a major change the tf API has been maintained in its current form. Since tf2 has a superset of the tf features with a subset of the dependencies the tf implementation has been removed and replaced with calls to tf2 under the hood. This will mean that all users will be compatible with tf2. It is recommended for new work to use tf2 directly as it has a cleaner interface. However tf will continue to be supported for through at least J Turtle.

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/geometry2/default.nix b/melodic/geometry2/default.nix index af0af4f33a..26f5c3e923 100644 --- a/melodic/geometry2/default.nix +++ b/melodic/geometry2/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A metapackage to bring in the default packages second generation Transform Library in ros, tf2.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/gl-dependency/default.nix b/melodic/gl-dependency/default.nix index 1c03d629a9..231c28a51d 100644 --- a/melodic/gl-dependency/default.nix +++ b/melodic/gl-dependency/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''This encapsulates the GL dependency for a specific ROS distribution and its Qt version''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/global-planner-tests/default.nix b/melodic/global-planner-tests/default.nix index 21f3b2b57b..9eae04b69d 100644 --- a/melodic/global-planner-tests/default.nix +++ b/melodic/global-planner-tests/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "39e04b13a621dc4fd2ceec66debbb65c93034d192a2d238c26fc425a67325074"; }; - buildInputs = [ map-server nav-msgs pluginlib libyamlcpp nav-core2 roscpp ]; + buildInputs = [ map-server pluginlib libyamlcpp nav-core2 nav-msgs roscpp ]; checkInputs = [ roslint ]; - propagatedBuildInputs = [ map-server nav-msgs pluginlib libyamlcpp nav-core2 roscpp ]; + propagatedBuildInputs = [ map-server pluginlib libyamlcpp nav-core2 nav-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A collection of tests for checking the validity and completeness of global planners.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/global-planner/default.nix b/melodic/global-planner/default.nix index 257d2fe1e7..eeea687df1 100644 --- a/melodic/global-planner/default.nix +++ b/melodic/global-planner/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, costmap-2d, pluginlib, tf2-geometry-msgs, navfn, nav-core, catkin, tf2-ros, nav-msgs, dynamic-reconfigure, angles, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, costmap-2d, pluginlib, tf2-geometry-msgs, navfn, nav-core, catkin, tf2-ros, nav-msgs, angles, dynamic-reconfigure, roscpp, geometry-msgs }: buildRosPackage { pname = "ros-melodic-global-planner"; version = "1.16.2"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "78802bdb91c6f0e8f194cbe2cfd7b68dca7a4c394c219aa8aba1b17d31e48c1a"; }; - buildInputs = [ costmap-2d pluginlib tf2-geometry-msgs navfn nav-core tf2-ros nav-msgs angles dynamic-reconfigure roscpp geometry-msgs ]; + buildInputs = [ costmap-2d pluginlib tf2-geometry-msgs navfn nav-core tf2-ros nav-msgs dynamic-reconfigure angles roscpp geometry-msgs ]; propagatedBuildInputs = [ costmap-2d pluginlib navfn nav-core tf2-ros nav-msgs dynamic-reconfigure roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A path planner library and node.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/goal-passer/default.nix b/melodic/goal-passer/default.nix index 21f8c3a79b..551113c272 100644 --- a/melodic/goal-passer/default.nix +++ b/melodic/goal-passer/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''A global planner plugin for move_base that simply passes the target pose on as a global plan. Useful for debugging local planners.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/gps-common/default.nix b/melodic/gps-common/default.nix index 30dbbfc4f7..95c36819df 100644 --- a/melodic/gps-common/default.nix +++ b/melodic/gps-common/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "ff84f3a082027035d2363ffcda76b01b2ac06432da53ccc6ee73898d3c502a03"; }; - buildInputs = [ nav-msgs message-generation rospy std-msgs sensor-msgs roscpp message-filters ]; - propagatedBuildInputs = [ nav-msgs message-runtime rospy std-msgs sensor-msgs roscpp message-filters ]; + buildInputs = [ sensor-msgs message-filters nav-msgs message-generation rospy std-msgs roscpp ]; + propagatedBuildInputs = [ sensor-msgs message-filters nav-msgs message-runtime rospy std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''GPS messages and common routines for use in GPS drivers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/gps-umd/default.nix b/melodic/gps-umd/default.nix index 8cd8c40e29..2a57febd78 100644 --- a/melodic/gps-umd/default.nix +++ b/melodic/gps-umd/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''gps_umd metapackage''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/gpsd-client/default.nix b/melodic/gpsd-client/default.nix index a5fd7f51de..3e376d4b82 100644 --- a/melodic/gpsd-client/default.nix +++ b/melodic/gpsd-client/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "fb72a43064b023d7be47f00194232ca28d92aea68d92e7b32d337bbe6cfda51c"; }; - buildInputs = [ gspd gps-common sensor-msgs roscpp pkg-config ]; + buildInputs = [ sensor-msgs pkg-config gspd gps-common roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''connects to a GPSd server and broadcasts GPS fixes using the NavSatFix message''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/graft/default.nix b/melodic/graft/default.nix index 7aad81b394..26a0f39920 100644 --- a/melodic/graft/default.nix +++ b/melodic/graft/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, cmake-modules, rosconsole, tf, sensor-msgs, catkin, nav-msgs, message-generation, message-runtime, eigen, dynamic-reconfigure, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, rosconsole, cmake-modules, tf, sensor-msgs, catkin, nav-msgs, message-generation, message-runtime, eigen, dynamic-reconfigure, roscpp, geometry-msgs }: buildRosPackage { pname = "ros-melodic-graft"; version = "0.2.3-r2"; @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "9a8974a928fe75527071337fedbe94266631129c0a1b9cb9d9163b06302bedce"; }; - buildInputs = [ rosconsole cmake-modules sensor-msgs roscpp nav-msgs message-generation eigen tf geometry-msgs ]; - propagatedBuildInputs = [ nav-msgs rosconsole message-runtime dynamic-reconfigure sensor-msgs tf geometry-msgs roscpp ]; + buildInputs = [ cmake-modules rosconsole sensor-msgs roscpp nav-msgs message-generation eigen tf geometry-msgs ]; + propagatedBuildInputs = [ rosconsole sensor-msgs roscpp nav-msgs message-runtime dynamic-reconfigure tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { @@ -24,6 +24,6 @@ buildRosPackage { If you try to use Graft now, please note that not all parameters are configured and you will not always see a change in behavior by modifying the parameters.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/graph-msgs/default.nix b/melodic/graph-msgs/default.nix index 252bef4123..47ad3301bd 100644 --- a/melodic/graph-msgs/default.nix +++ b/melodic/graph-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS messages for publishing graphs of different data types''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grasping-msgs/default.nix b/melodic/grasping-msgs/default.nix index 02c8e2a091..e44740f5e4 100644 --- a/melodic/grasping-msgs/default.nix +++ b/melodic/grasping-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "1deeb71cb90294e0027a324105670add8ffd4dabbcd454cc4d2b9508f4fe89af"; }; - buildInputs = [ shape-msgs message-generation actionlib moveit-msgs sensor-msgs geometry-msgs ]; - propagatedBuildInputs = [ shape-msgs message-runtime actionlib moveit-msgs sensor-msgs geometry-msgs ]; + buildInputs = [ shape-msgs sensor-msgs message-generation actionlib moveit-msgs geometry-msgs ]; + propagatedBuildInputs = [ shape-msgs sensor-msgs message-runtime actionlib moveit-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Messages for describing objects and how to grasp them.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-core/default.nix b/melodic/grid-map-core/default.nix index 0c9e71d851..45c0efc7e0 100644 --- a/melodic/grid-map-core/default.nix +++ b/melodic/grid-map-core/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Universal grid map library to manage two-dimensional grid maps with multiple data layers.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-costmap-2d/default.nix b/melodic/grid-map-costmap-2d/default.nix index 2bf74ad103..83a295bd87 100644 --- a/melodic/grid-map-costmap-2d/default.nix +++ b/melodic/grid-map-costmap-2d/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Interface for grid maps to the costmap_2d format.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-cv/default.nix b/melodic/grid-map-cv/default.nix index b6f53dd098..9acb6c76d9 100644 --- a/melodic/grid-map-cv/default.nix +++ b/melodic/grid-map-cv/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Conversions between grid maps and OpenCV images.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-demos/default.nix b/melodic/grid-map-demos/default.nix index 9ba3390003..4767f43fc0 100644 --- a/melodic/grid-map-demos/default.nix +++ b/melodic/grid-map-demos/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Demo nodes to demonstrate the usage of the grid map library.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-filters/default.nix b/melodic/grid-map-filters/default.nix index 87232957a8..c828d2703f 100644 --- a/melodic/grid-map-filters/default.nix +++ b/melodic/grid-map-filters/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Processing grid maps as a sequence of ROS filters.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-loader/default.nix b/melodic/grid-map-loader/default.nix index ca48d9a540..b5023ba61a 100644 --- a/melodic/grid-map-loader/default.nix +++ b/melodic/grid-map-loader/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Loading and publishing grid maps from bag files.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-msgs/default.nix b/melodic/grid-map-msgs/default.nix index 1e50294846..948b80bf67 100644 --- a/melodic/grid-map-msgs/default.nix +++ b/melodic/grid-map-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Definition of the multi-layered grid map message type.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-octomap/default.nix b/melodic/grid-map-octomap/default.nix index 26d90e09f2..ef2294480f 100644 --- a/melodic/grid-map-octomap/default.nix +++ b/melodic/grid-map-octomap/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Conversions between grid maps and OctoMap types.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-pcl/default.nix b/melodic/grid-map-pcl/default.nix index c166255307..2e720c8a5c 100644 --- a/melodic/grid-map-pcl/default.nix +++ b/melodic/grid-map-pcl/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Conversions between grid maps and Point Cloud Library (PCL) types.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-ros/default.nix b/melodic/grid-map-ros/default.nix index 62bc38973b..800b81447f 100644 --- a/melodic/grid-map-ros/default.nix +++ b/melodic/grid-map-ros/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS interface for the grid map library to manage two-dimensional grid maps with multiple data layers.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-rviz-plugin/default.nix b/melodic/grid-map-rviz-plugin/default.nix index 35649a5536..b158bb0b06 100644 --- a/melodic/grid-map-rviz-plugin/default.nix +++ b/melodic/grid-map-rviz-plugin/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ grid-map-msgs grid-map-ros rviz qt5.qtbase ]; - propagatedBuildInputs = [ grid-map-ros rviz grid-map-msgs qt5.qtbase ]; + propagatedBuildInputs = [ grid-map-msgs grid-map-ros rviz qt5.qtbase ]; nativeBuildInputs = [ catkin ]; meta = { description = ''RViz plugin for displaying grid map messages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-sdf/default.nix b/melodic/grid-map-sdf/default.nix index 7347af1e8d..3fa49faee6 100644 --- a/melodic/grid-map-sdf/default.nix +++ b/melodic/grid-map-sdf/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Generates signed distance fields from grid maps.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map-visualization/default.nix b/melodic/grid-map-visualization/default.nix index cedde2fd96..d2846f3ba9 100644 --- a/melodic/grid-map-visualization/default.nix +++ b/melodic/grid-map-visualization/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, grid-map-core, tf, sensor-msgs, catkin, grid-map-ros, nav-msgs, visualization-msgs, grid-map-msgs, roscpp }: +{ lib, buildRosPackage, fetchurl, grid-map-core, sensor-msgs, catkin, roscpp, grid-map-ros, nav-msgs, visualization-msgs, grid-map-msgs, tf }: buildRosPackage { pname = "ros-melodic-grid-map-visualization"; version = "1.6.1"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "c35030b57adc01d75f9d3e5e061c933839f850d7a4d6dbc4d9a0f3fcdd1e0803"; }; - buildInputs = [ grid-map-core grid-map-ros nav-msgs visualization-msgs tf grid-map-msgs roscpp sensor-msgs ]; - propagatedBuildInputs = [ grid-map-core grid-map-ros nav-msgs visualization-msgs tf grid-map-msgs roscpp sensor-msgs ]; + buildInputs = [ grid-map-core tf sensor-msgs grid-map-ros nav-msgs visualization-msgs grid-map-msgs roscpp ]; + propagatedBuildInputs = [ grid-map-core tf sensor-msgs grid-map-ros nav-msgs visualization-msgs grid-map-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Configurable tool to visualize grid maps in RViz.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grid-map/default.nix b/melodic/grid-map/default.nix index 360c2d0674..8a8bf58b9e 100644 --- a/melodic/grid-map/default.nix +++ b/melodic/grid-map/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Meta-package for the universal grid map library.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/gripper-action-controller/default.nix b/melodic/gripper-action-controller/default.nix index 9c263fd65a..eb34c0a0be 100644 --- a/melodic/gripper-action-controller/default.nix +++ b/melodic/gripper-action-controller/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "7b15202e7175d3352a3855ee222ddbd4db8a5221425436f4637a80e600907ce2"; }; - buildInputs = [ controller-manager hardware-interface cmake-modules control-msgs realtime-tools control-toolbox trajectory-msgs controller-interface urdf actionlib angles roscpp xacro ]; - propagatedBuildInputs = [ controller-manager hardware-interface cmake-modules control-msgs realtime-tools control-toolbox trajectory-msgs controller-interface urdf actionlib angles roscpp xacro ]; + buildInputs = [ controller-manager hardware-interface cmake-modules control-msgs trajectory-msgs realtime-tools control-toolbox controller-interface urdf actionlib angles roscpp xacro ]; + propagatedBuildInputs = [ controller-manager hardware-interface cmake-modules control-msgs trajectory-msgs realtime-tools control-toolbox controller-interface urdf actionlib angles roscpp xacro ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The gripper_action_controller package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/grpc/default.nix b/melodic/grpc/default.nix index 72951bef32..e66434c367 100644 --- a/melodic/grpc/default.nix +++ b/melodic/grpc/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "c68b25e98a58f726e6d9a86a1a16c943c468e8f1d426781f9086cd31c525e7b2"; }; - buildInputs = [ zlib autoconf git rsync libtool ]; + buildInputs = [ autoconf git rsync libtool zlib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Catkinized gRPC Package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/gscam/default.nix b/melodic/gscam/default.nix index 43353420e5..7934f49ecb 100644 --- a/melodic/gscam/default.nix +++ b/melodic/gscam/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, camera-info-manager, image-transport, camera-calibration-parsers, cv-bridge, sensor-msgs, gst_all_1, catkin, nodelet, roscpp }: +{ lib, buildRosPackage, fetchurl, camera-calibration-parsers, image-transport, sensor-msgs, camera-info-manager, cv-bridge, gst_all_1, catkin, nodelet, roscpp }: buildRosPackage { pname = "ros-melodic-gscam"; version = "1.0.1"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "bbd838538ef852691f2de43b5b0a5541e0b8f4a8bd1c5ef7d0bb5c5387491996"; }; - buildInputs = [ camera-info-manager camera-calibration-parsers image-transport cv-bridge sensor-msgs gst_all_1.gstreamer roscpp gst_all_1.gst-plugins-base nodelet ]; - propagatedBuildInputs = [ camera-info-manager cv-bridge nodelet camera-calibration-parsers image-transport sensor-msgs roscpp ]; + buildInputs = [ camera-calibration-parsers image-transport sensor-msgs camera-info-manager cv-bridge gst_all_1.gstreamer roscpp gst_all_1.gst-plugins-base nodelet ]; + propagatedBuildInputs = [ camera-calibration-parsers image-transport sensor-msgs camera-info-manager cv-bridge nodelet roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A ROS camera driver that uses gstreamer to connect to devices such as webcams.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/h264-encoder-core/default.nix b/melodic/h264-encoder-core/default.nix index 637e4df680..4a6b0e9d39 100644 --- a/melodic/h264-encoder-core/default.nix +++ b/melodic/h264-encoder-core/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Common base code for ROS1/ROS2 H264 encoder node''; - #license = lib.licenses.LGPLv2.1; + license = with lib.licenses; [ lgpl21 ]; }; } diff --git a/melodic/h264-video-encoder/default.nix b/melodic/h264-video-encoder/default.nix index 8ccdf40fdb..de5f460f1e 100644 --- a/melodic/h264-video-encoder/default.nix +++ b/melodic/h264-video-encoder/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "c295ba7a0e8cb25eacccc5092b810f0951c20268345218d2634bd6ecc30d0608"; }; - buildInputs = [ h264-encoder-core message-generation image-transport kinesis-video-msgs aws-ros1-common sensor-msgs ]; + buildInputs = [ h264-encoder-core image-transport sensor-msgs message-generation kinesis-video-msgs aws-ros1-common ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ image-transport kinesis-video-msgs message-runtime aws-ros1-common sensor-msgs image-transport-plugins ]; + propagatedBuildInputs = [ image-transport sensor-msgs image-transport-plugins kinesis-video-msgs message-runtime aws-ros1-common ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS1 H264 encoder node''; - #license = lib.licenses.LGPLv2.1; + license = with lib.licenses; [ lgpl21 ]; }; } diff --git a/melodic/hardware-interface/default.nix b/melodic/hardware-interface/default.nix index bb99e0a863..3395e2be0b 100644 --- a/melodic/hardware-interface/default.nix +++ b/melodic/hardware-interface/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Hardware Interface base class.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/health-metric-collector/default.nix b/melodic/health-metric-collector/default.nix index cfb6eb5c5b..83817d7391 100644 --- a/melodic/health-metric-collector/default.nix +++ b/melodic/health-metric-collector/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "a0b78f0e8e9edbbea16f0837f64764358c03dad0b2e2bd07012c802697b20d78"; }; - buildInputs = [ message-generation aws-common rospy std-msgs aws-ros1-common ros-monitoring-msgs roscpp ]; + buildInputs = [ roscpp message-generation aws-common rospy std-msgs aws-ros1-common ros-monitoring-msgs ]; checkInputs = [ rostest gmock ]; - propagatedBuildInputs = [ message-generation aws-common message-runtime ros-monitoring-msgs rospy std-msgs aws-ros1-common roscpp ]; + propagatedBuildInputs = [ ros-monitoring-msgs message-generation aws-common message-runtime rospy std-msgs aws-ros1-common roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The health_metric_collector package''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/hebi-cpp-api/default.nix b/melodic/hebi-cpp-api/default.nix index a9efeacc0d..6496eb6451 100644 --- a/melodic/hebi-cpp-api/default.nix +++ b/melodic/hebi-cpp-api/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A ROS package providing access to the HEBI C++ API.''; - #license = lib.licenses.HEBI C++ Software License (https://www.hebirobotics.com/softwarelicense); + license = with lib.licenses; [ "HEBI C++ Software License (https://www.hebirobotics.com/softwarelicense)" ]; }; } diff --git a/melodic/hector-components-description/default.nix b/melodic/hector-components-description/default.nix index c27b75df18..9856ce84d7 100644 --- a/melodic/hector-components-description/default.nix +++ b/melodic/hector-components-description/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''hector_components_description contains URDF xacro macros for robot components, so they are easily attachable to robot models.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/hector-gazebo-plugins/default.nix b/melodic/hector-gazebo-plugins/default.nix index f7962fee95..4aef8673bc 100644 --- a/melodic/hector-gazebo-plugins/default.nix +++ b/melodic/hector-gazebo-plugins/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "950bd57e9157767ab5699a7b93eee1083a484633b26f8931b433c71755716159"; }; - buildInputs = [ std-srvs roscpp gazebo-dev nav-msgs message-generation dynamic-reconfigure std-msgs tf geometry-msgs ]; + buildInputs = [ std-srvs roscpp gazebo-dev message-generation nav-msgs dynamic-reconfigure std-msgs tf geometry-msgs ]; propagatedBuildInputs = [ gazebo-ros std-srvs gazeboSimulator.gazebo roscpp nav-msgs message-runtime dynamic-reconfigure std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; @@ -21,6 +21,6 @@ buildRosPackage { Currently it contains a 6wd differential drive plugin, an IMU sensor plugin, an earth magnetic field sensor plugin, a GPS sensor plugin and a sonar ranger plugin.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/hector-gazebo-thermal-camera/default.nix b/melodic/hector-gazebo-thermal-camera/default.nix index c157586753..8b9556afbf 100644 --- a/melodic/hector-gazebo-thermal-camera/default.nix +++ b/melodic/hector-gazebo-thermal-camera/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''hector_gazebo_thermal_camera provides a gazebo plugin that produces simulated thermal camera images. The plugin uses modified code from the gazebo_ros_camera plugin.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/hector-gazebo-worlds/default.nix b/melodic/hector-gazebo-worlds/default.nix index fe3a42fc78..803365c9ac 100644 --- a/melodic/hector-gazebo-worlds/default.nix +++ b/melodic/hector-gazebo-worlds/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''hector_gazebo_worlds provides gazebo scenarios used by Team Hector Darmstadt''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/hector-gazebo/default.nix b/melodic/hector-gazebo/default.nix index 4d37f18443..4dd54baffa 100644 --- a/melodic/hector-gazebo/default.nix +++ b/melodic/hector-gazebo/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''hector_gazebo provides packages related to to simulation of robots using gazebo (gazebo plugins, world files etc.)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/hector-models/default.nix b/melodic/hector-models/default.nix index 55b43eb5ac..d7e628401d 100644 --- a/melodic/hector-models/default.nix +++ b/melodic/hector-models/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''hector_models contains (urdf) models of robots, sensors etc.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/hector-sensors-description/default.nix b/melodic/hector-sensors-description/default.nix index f4ce8bc4e1..7e70e5bebd 100644 --- a/melodic/hector-sensors-description/default.nix +++ b/melodic/hector-sensors-description/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''hector_sensors_description contains URDF xacro macros for sensors, so they are easily attachable to robot models and usable in gazebo.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/hector-sensors-gazebo/default.nix b/melodic/hector-sensors-gazebo/default.nix index 168790b923..a811b170ce 100644 --- a/melodic/hector-sensors-gazebo/default.nix +++ b/melodic/hector-sensors-gazebo/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''hector_sensors_gazebo depends on the necessary plugins for using the sensors from the hector_models repository.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/hector-xacro-tools/default.nix b/melodic/hector-xacro-tools/default.nix index 2d3f9262fd..a635254fbe 100644 --- a/melodic/hector-xacro-tools/default.nix +++ b/melodic/hector-xacro-tools/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''hector_xacro_tools''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/hls-lfcd-lds-driver/default.nix b/melodic/hls-lfcd-lds-driver/default.nix index d1eb438be2..664bc550d6 100644 --- a/melodic/hls-lfcd-lds-driver/default.nix +++ b/melodic/hls-lfcd-lds-driver/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ROS package for LDS(HLS-LFCD2). The LDS (Laser Distance Sensor) is a sensor sending the data to Host for the simultaneous localization and mapping (SLAM). Simultaneously the detecting obstacle data can also be sent to Host. HLDS(Hitachi-LG Data Storage) is developing the technology for the moving platform sensor such as Robot Vacuum Cleaners, Home Robot, Robotics Lawn Mower Sensor, etc.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/hostapd-access-point/default.nix b/melodic/hostapd-access-point/default.nix index 19f4339d52..2c009ef290 100644 --- a/melodic/hostapd-access-point/default.nix +++ b/melodic/hostapd-access-point/default.nix @@ -22,6 +22,6 @@ buildRosPackage { network adapter running in master mode. It implements the dynamic_reconfigure interface defined in the [[access_point_control]] package.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/hpp-fcl/default.nix b/melodic/hpp-fcl/default.nix index 5a64331ced..1c9a078a48 100644 --- a/melodic/hpp-fcl/default.nix +++ b/melodic/hpp-fcl/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "f6c9669e0b2cf9cbc04bfc89014ae8a82b0895e65eec29d65ca557ca6d375a41"; }; - buildInputs = [ octomap boost eigen git assimp ]; + buildInputs = [ boost git assimp octomap eigen ]; propagatedBuildInputs = [ octomap boost assimp eigen ]; nativeBuildInputs = [ catkin ]; meta = { description = ''HPP fork of FCL with bug fixes.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ibeo-core/default.nix b/melodic/ibeo-core/default.nix index 212659dd45..5f971015fa 100644 --- a/melodic/ibeo-core/default.nix +++ b/melodic/ibeo-core/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The ibeo_core package''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/ibeo-lux/default.nix b/melodic/ibeo-lux/default.nix index dd10ac2540..0f2fb5ab1e 100644 --- a/melodic/ibeo-lux/default.nix +++ b/melodic/ibeo-lux/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, network-interface, catkin, ibeo-core, ibeo-msgs, visualization-msgs, pcl-ros, std-msgs, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, network-interface, catkin, ibeo-core, std-msgs, visualization-msgs, pcl-ros, ibeo-msgs, roscpp, geometry-msgs }: buildRosPackage { pname = "ros-melodic-ibeo-lux"; version = "2.0.1"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "0aa9797cbee3936a930074405e44de2f604c0eaf99b7b4e6b60d3773243a0fb3"; }; - buildInputs = [ ibeo-core ibeo-msgs pcl-ros std-msgs network-interface visualization-msgs geometry-msgs roscpp ]; - propagatedBuildInputs = [ ibeo-core ibeo-msgs pcl-ros std-msgs network-interface visualization-msgs geometry-msgs roscpp ]; + buildInputs = [ network-interface roscpp ibeo-core ibeo-msgs pcl-ros std-msgs visualization-msgs geometry-msgs ]; + propagatedBuildInputs = [ network-interface roscpp ibeo-core ibeo-msgs pcl-ros std-msgs visualization-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS driver for IBEO LUX''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/ibeo-msgs/default.nix b/melodic/ibeo-msgs/default.nix index 24dd03e194..addd2daa03 100644 --- a/melodic/ibeo-msgs/default.nix +++ b/melodic/ibeo-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Package containing messages for Ibeo sensors.''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/ieee80211-channels/default.nix b/melodic/ieee80211-channels/default.nix index e6d47b7be5..8b1feecbdd 100644 --- a/melodic/ieee80211-channels/default.nix +++ b/melodic/ieee80211-channels/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''This package provides mapping from frequencies to IEEE802.11 channels and vice-versa.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/igvc-self-drive-description/default.nix b/melodic/igvc-self-drive-description/default.nix index da6a0c35a2..a00eeb9cdd 100644 --- a/melodic/igvc-self-drive-description/default.nix +++ b/melodic/igvc-self-drive-description/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Meshes and URDF descriptions for Gem vehicle''; - #license = lib.licenses.BSD2; + license = with lib.licenses; [ bsd2 ]; }; } diff --git a/melodic/igvc-self-drive-gazebo-plugins/default.nix b/melodic/igvc-self-drive-gazebo-plugins/default.nix index 44dbe70389..6a2643fc81 100644 --- a/melodic/igvc-self-drive-gazebo-plugins/default.nix +++ b/melodic/igvc-self-drive-gazebo-plugins/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, gazebo-ros, gazebo-ros-pkgs, hector-gazebo-plugins, catkin, hector-models, robot-state-publisher, dynamic-reconfigure, roscpp }: +{ lib, buildRosPackage, fetchurl, gazebo-ros, gazebo-ros-pkgs, hector-models, catkin, hector-gazebo-plugins, robot-state-publisher, dynamic-reconfigure, roscpp }: buildRosPackage { pname = "ros-melodic-igvc-self-drive-gazebo-plugins"; version = "0.1.4-r1"; @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ gazebo-ros roscpp dynamic-reconfigure ]; - propagatedBuildInputs = [ gazebo-ros gazebo-ros-pkgs robot-state-publisher dynamic-reconfigure hector-models hector-gazebo-plugins roscpp ]; + propagatedBuildInputs = [ gazebo-ros gazebo-ros-pkgs hector-gazebo-plugins hector-models robot-state-publisher dynamic-reconfigure roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Gazebo plugins for IGVC Self-Drive simulator''; - #license = lib.licenses.BSD2; + license = with lib.licenses; [ bsd2 ]; }; } diff --git a/melodic/igvc-self-drive-gazebo/default.nix b/melodic/igvc-self-drive-gazebo/default.nix index aff55e4084..6e2a8fa50f 100644 --- a/melodic/igvc-self-drive-gazebo/default.nix +++ b/melodic/igvc-self-drive-gazebo/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Gazebo models and runtime configuration for igvc_self_drive simulator''; - #license = lib.licenses.BSD2; + license = with lib.licenses; [ bsd2 ]; }; } diff --git a/melodic/igvc-self-drive-sim/default.nix b/melodic/igvc-self-drive-sim/default.nix index 0e12bd5943..5c24dab761 100644 --- a/melodic/igvc-self-drive-sim/default.nix +++ b/melodic/igvc-self-drive-sim/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Metapackage for igvc_self_drive_sim''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/image-cb-detector/default.nix b/melodic/image-cb-detector/default.nix index 0f73c5815f..8279e80315 100644 --- a/melodic/image-cb-detector/default.nix +++ b/melodic/image-cb-detector/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Provide a node that extracts checkerboard corners from ROS images. This package is still experimental and unstable. Expect its APIs to change.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/image-common/default.nix b/melodic/image-common/default.nix index a06b051968..122d5063a6 100644 --- a/melodic/image-common/default.nix +++ b/melodic/image-common/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Common code for working with images in ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/image-geometry/default.nix b/melodic/image-geometry/default.nix index e895433c9f..1a7ca14281 100644 --- a/melodic/image-geometry/default.nix +++ b/melodic/image-geometry/default.nix @@ -21,6 +21,6 @@ buildRosPackage { geometrically. It interfaces the calibration parameters in sensor_msgs/CameraInfo messages with OpenCV functions such as image rectification, much as cv_bridge interfaces ROS sensor_msgs/Image with OpenCV data types.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/image-pipeline/default.nix b/melodic/image-pipeline/default.nix index 27efa839e7..0c9fc9ae22 100644 --- a/melodic/image-pipeline/default.nix +++ b/melodic/image-pipeline/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "a6e5d39fd81ad438d67124e646c3da415e14afb3d0e59931e0d40433a6c1ea77"; }; - propagatedBuildInputs = [ image-rotate stereo-image-proc depth-image-proc image-view image-publisher image-proc camera-calibration ]; + propagatedBuildInputs = [ image-rotate stereo-image-proc depth-image-proc camera-calibration image-view image-publisher image-proc ]; nativeBuildInputs = [ catkin ]; meta = { description = ''image_pipeline fills the gap between getting raw images from a camera driver and higher-level vision processing.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/image-proc/default.nix b/melodic/image-proc/default.nix index 17edbf6a2a..d8accbf6af 100644 --- a/melodic/image-proc/default.nix +++ b/melodic/image-proc/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, boost, camera-calibration-parsers, image-transport, sensor-msgs, cv-bridge, nodelet-topic-tools, catkin, roscpp, image-geometry, rostest, dynamic-reconfigure, nodelet }: +{ lib, buildRosPackage, fetchurl, boost, camera-calibration-parsers, image-transport, sensor-msgs, cv-bridge, nodelet-topic-tools, catkin, image-geometry, rostest, nodelet, dynamic-reconfigure, roscpp }: buildRosPackage { pname = "ros-melodic-image-proc"; version = "1.12.23"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "93803bd635f79e7a5c87d295d612a389f21af03603f691b8c392ca9c894c6939"; }; - buildInputs = [ boost image-transport sensor-msgs cv-bridge nodelet-topic-tools roscpp image-geometry dynamic-reconfigure nodelet ]; + buildInputs = [ boost image-transport sensor-msgs nodelet-topic-tools cv-bridge image-geometry nodelet dynamic-reconfigure roscpp ]; checkInputs = [ camera-calibration-parsers rostest ]; - propagatedBuildInputs = [ cv-bridge nodelet dynamic-reconfigure image-transport sensor-msgs nodelet-topic-tools roscpp image-geometry ]; + propagatedBuildInputs = [ image-transport sensor-msgs nodelet-topic-tools cv-bridge image-geometry nodelet dynamic-reconfigure roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Single image rectification and color processing.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/image-publisher/default.nix b/melodic/image-publisher/default.nix index 935e130074..36afa0c867 100644 --- a/melodic/image-publisher/default.nix +++ b/melodic/image-publisher/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "56bebe095951f6cfb7e0d4c0250ed2dea459b085b214b9e21cdd93f4878efa4a"; }; - buildInputs = [ cv-bridge nodelet dynamic-reconfigure camera-info-manager image-transport sensor-msgs roscpp ]; - propagatedBuildInputs = [ cv-bridge nodelet dynamic-reconfigure camera-info-manager image-transport sensor-msgs roscpp ]; + buildInputs = [ camera-info-manager image-transport sensor-msgs cv-bridge nodelet dynamic-reconfigure roscpp ]; + propagatedBuildInputs = [ camera-info-manager image-transport sensor-msgs cv-bridge nodelet dynamic-reconfigure roscpp ]; nativeBuildInputs = [ catkin ]; meta = { @@ -21,6 +21,6 @@ buildRosPackage { Contains a node publish an image stream from single image file or avi motion file.

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/image-rotate/default.nix b/melodic/image-rotate/default.nix index 9e208f2a4e..8b44826225 100644 --- a/melodic/image-rotate/default.nix +++ b/melodic/image-rotate/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, cmake-modules, tf2-geometry-msgs, image-transport, catkin, cv-bridge, tf2-ros, roscpp, tf2, rostest, dynamic-reconfigure, nodelet, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, cmake-modules, tf2-geometry-msgs, image-transport, catkin, cv-bridge, tf2-ros, tf2, rostest, nodelet, dynamic-reconfigure, roscpp, geometry-msgs }: buildRosPackage { pname = "ros-melodic-image-rotate"; version = "1.12.23"; @@ -12,9 +12,9 @@ buildRosPackage { sha256 = "300158018b97ce2b2f3cdfac00889d443b74165b3fb49105317148c76657638a"; }; - buildInputs = [ cmake-modules tf2-geometry-msgs image-transport cv-bridge roscpp tf2-ros tf2 dynamic-reconfigure nodelet geometry-msgs ]; + buildInputs = [ cmake-modules tf2-geometry-msgs image-transport cv-bridge tf2-ros tf2 nodelet dynamic-reconfigure roscpp geometry-msgs ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ tf2 cv-bridge tf2-ros tf2-geometry-msgs dynamic-reconfigure image-transport nodelet roscpp ]; + propagatedBuildInputs = [ tf2-geometry-msgs image-transport cv-bridge roscpp tf2-ros tf2 dynamic-reconfigure nodelet ]; nativeBuildInputs = [ catkin ]; meta = { @@ -36,6 +36,6 @@ buildRosPackage { computation, as it interpolates the source image, introduces black borders, and does not output a camera_info.

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/image-transport-plugins/default.nix b/melodic/image-transport-plugins/default.nix index 1d21b771a4..023596c084 100644 --- a/melodic/image-transport-plugins/default.nix +++ b/melodic/image-transport-plugins/default.nix @@ -21,6 +21,6 @@ buildRosPackage { stream of images off-robot, a video codec will give much lower bandwidth and latency. For low frame rate tranport of high-definition images, you might prefer sending them as JPEG or PNG-compressed form.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/image-transport/default.nix b/melodic/image-transport/default.nix index f04c55b0a7..76b1b6caf0 100644 --- a/melodic/image-transport/default.nix +++ b/melodic/image-transport/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "070c49d03d5320c322237672d62c34b3fd3f8c4b311a76f3572894f368421d55"; }; - buildInputs = [ roslib pluginlib rosconsole sensor-msgs roscpp message-filters ]; - propagatedBuildInputs = [ roslib pluginlib rosconsole sensor-msgs roscpp message-filters ]; + buildInputs = [ pluginlib rosconsole sensor-msgs message-filters roslib roscpp ]; + propagatedBuildInputs = [ pluginlib rosconsole sensor-msgs message-filters roslib roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''image_transport should always be used to subscribe to and publish images. It provides transparent support for transporting images in low-bandwidth compressed formats. Examples (provided by separate plugin packages) include JPEG/PNG compression and Theora streaming video.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/image-view/default.nix b/melodic/image-view/default.nix index 7e251625b3..64c457e595 100644 --- a/melodic/image-view/default.nix +++ b/melodic/image-view/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''A simple viewer for ROS image topics. Includes a specialized viewer for stereo + disparity images.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/image-view2/default.nix b/melodic/image-view2/default.nix index bb39744de1..54121ca7ab 100644 --- a/melodic/image-view2/default.nix +++ b/melodic/image-view2/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''A simple viewer for ROS image topics with draw-on features''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/imagesift/default.nix b/melodic/imagesift/default.nix index e5cc0abb61..ee4808361d 100644 --- a/melodic/imagesift/default.nix +++ b/melodic/imagesift/default.nix @@ -12,15 +12,15 @@ buildRosPackage { sha256 = "322d64597608e08314224ee31b4fd32f1d3ab7fe3b6fea7cbff20131e411ffc5"; }; - buildInputs = [ cmake-modules libsiftfast image-transport sensor-msgs cv-bridge jsk-topic-tools posedetection-msgs roscpp jsk-recognition-utils nodelet ]; + buildInputs = [ cmake-modules libsiftfast image-transport sensor-msgs cv-bridge posedetection-msgs jsk-topic-tools roscpp jsk-recognition-utils nodelet ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ libsiftfast image-transport sensor-msgs cv-bridge jsk-topic-tools posedetection-msgs roscpp jsk-recognition-utils nodelet ]; + propagatedBuildInputs = [ libsiftfast image-transport sensor-msgs cv-bridge posedetection-msgs jsk-topic-tools roscpp jsk-recognition-utils nodelet ]; nativeBuildInputs = [ catkin ]; meta = { description = ''For every image, computes its sift features and send a new message with the image, its intrinsic parameters, and the features. Parameters include: display - shows the image on the local computer''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/imagezero-image-transport/default.nix b/melodic/imagezero-image-transport/default.nix index 87d8eb5972..b8c4651bf1 100644 --- a/melodic/imagezero-image-transport/default.nix +++ b/melodic/imagezero-image-transport/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "4c9fbc7c319b30bb24174343cc8e901e9908725890f11cdca4866fbd4f4550ed"; }; - buildInputs = [ message-runtime image-transport sensor-msgs cv-bridge imagezero-ros ]; - propagatedBuildInputs = [ message-runtime image-transport sensor-msgs cv-bridge imagezero-ros ]; + buildInputs = [ image-transport sensor-msgs cv-bridge message-runtime imagezero-ros ]; + propagatedBuildInputs = [ image-transport sensor-msgs cv-bridge message-runtime imagezero-ros ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A plugin to image_transport for transparently sending images encoded with ImageZero.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/imagezero-ros/default.nix b/melodic/imagezero-ros/default.nix index 92ebb6449e..d6fefb5f2c 100644 --- a/melodic/imagezero-ros/default.nix +++ b/melodic/imagezero-ros/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "3bebcdd5695eedb7733be8f49515ff4c8d341fe5f75f09442ddb2e5ca44a1766"; }; - buildInputs = [ message-runtime sensor-msgs cv-bridge roscpp imagezero ]; + buildInputs = [ sensor-msgs cv-bridge imagezero message-runtime roscpp ]; propagatedBuildInputs = [ sensor-msgs cv-bridge message-runtime imagezero ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A library that provides convenient methods for manipulating ROS images with ImageZero''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/imagezero/default.nix b/melodic/imagezero/default.nix index 98831a8f8b..a2a02c7118 100644 --- a/melodic/imagezero/default.nix +++ b/melodic/imagezero/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''ImageZero is a fast lossless image compression algorithm for RGB color photos.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/imu-complementary-filter/default.nix b/melodic/imu-complementary-filter/default.nix index b885232026..79245a5463 100644 --- a/melodic/imu-complementary-filter/default.nix +++ b/melodic/imu-complementary-filter/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, cmake-modules, tf, sensor-msgs, catkin, message-filters, std-msgs, roscpp }: +{ lib, buildRosPackage, fetchurl, cmake-modules, sensor-msgs, catkin, message-filters, roscpp, std-msgs, tf }: buildRosPackage { pname = "ros-melodic-imu-complementary-filter"; version = "1.2.0"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "c23c27697af1b9f37cc30cde2c65855eadd20cf0faa3264b2dfeaeeb54a915da"; }; - buildInputs = [ cmake-modules std-msgs sensor-msgs tf message-filters roscpp ]; - propagatedBuildInputs = [ std-msgs sensor-msgs roscpp message-filters tf ]; + buildInputs = [ cmake-modules sensor-msgs message-filters roscpp std-msgs tf ]; + propagatedBuildInputs = [ tf sensor-msgs message-filters std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Filter which fuses angular velocities, accelerations, and (optionally) magnetic readings from a generic IMU device into a quaternion to represent the orientation of the device wrt the global frame. Based on the algorithm by Roberto G. Valenti etal. described in the paper "Keeping a Good Attitude: A Quaternion-Based Orientation Filter for IMUs and MARGs" available at http://www.mdpi.com/1424-8220/15/8/19302 .''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/imu-filter-madgwick/default.nix b/melodic/imu-filter-madgwick/default.nix index dd5272e74c..b0a657e3d7 100644 --- a/melodic/imu-filter-madgwick/default.nix +++ b/melodic/imu-filter-madgwick/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Filter which fuses angular velocities, accelerations, and (optionally) magnetic readings from a generic IMU device into an orientation. Based on code by Sebastian Madgwick, http://www.x-io.co.uk/node/8#open_source_ahrs_and_imu_algorithms.''; - #license = lib.licenses.GPL; + license = with lib.licenses; [ gpl1 ]; }; } diff --git a/melodic/imu-pipeline/default.nix b/melodic/imu-pipeline/default.nix index d06f3df661..5df7d3ad69 100644 --- a/melodic/imu-pipeline/default.nix +++ b/melodic/imu-pipeline/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''imu_pipeline''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal gpl1 ]; }; } diff --git a/melodic/imu-processors/default.nix b/melodic/imu-processors/default.nix index 0b2286e85f..1d11e98ab8 100644 --- a/melodic/imu-processors/default.nix +++ b/melodic/imu-processors/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "68dd63390a89e5634e7ae241aa2e8c21e8e80753d49eaf8569de7f8ac1c8dfd3"; }; - buildInputs = [ nav-msgs geometry-msgs sensor-msgs tf roscpp ]; - propagatedBuildInputs = [ nav-msgs geometry-msgs sensor-msgs tf roscpp ]; + buildInputs = [ sensor-msgs roscpp nav-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs roscpp nav-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Processors for sensor_msgs::Imu data''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/imu-sensor-controller/default.nix b/melodic/imu-sensor-controller/default.nix index 05968f9e0a..6a71b8beff 100644 --- a/melodic/imu-sensor-controller/default.nix +++ b/melodic/imu-sensor-controller/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "9e5a18ddf716a8a9edd539104025b9d6828acb17b690b660780b56f05c2f0948"; }; - buildInputs = [ hardware-interface controller-interface pluginlib realtime-tools sensor-msgs roscpp ]; - propagatedBuildInputs = [ hardware-interface controller-interface pluginlib realtime-tools sensor-msgs roscpp ]; + buildInputs = [ hardware-interface pluginlib realtime-tools sensor-msgs controller-interface roscpp ]; + propagatedBuildInputs = [ hardware-interface pluginlib realtime-tools sensor-msgs controller-interface roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Controller to publish state of IMU sensors''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/imu-tools/default.nix b/melodic/imu-tools/default.nix index 4a96f2e73e..a9eaf1f33b 100644 --- a/melodic/imu-tools/default.nix +++ b/melodic/imu-tools/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Various tools for IMU devices''; - #license = lib.licenses.BSD, GPL; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/imu-transformer/default.nix b/melodic/imu-transformer/default.nix index 76448a3428..bcf4443aba 100644 --- a/melodic/imu-transformer/default.nix +++ b/melodic/imu-transformer/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "385d6b98746a58cc8dcc26c189a5a3c9853b553794798cd352ebe3445def8dd3"; }; - buildInputs = [ sensor-msgs message-filters roscpp tf2-ros tf2-sensor-msgs tf2 topic-tools roslaunch nodelet geometry-msgs ]; + buildInputs = [ sensor-msgs message-filters tf2-ros tf2-sensor-msgs tf2 nodelet topic-tools roslaunch roscpp geometry-msgs ]; propagatedBuildInputs = [ sensor-msgs message-filters roscpp tf2-ros tf2-sensor-msgs tf2 nodelet topic-tools roslaunch tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another.''; - #license = lib.licenses.GPL; + license = with lib.licenses; [ gpl1 ]; }; } diff --git a/melodic/industrial-core/default.nix b/melodic/industrial-core/default.nix index 25a6157638..6fc7ce7e27 100644 --- a/melodic/industrial-core/default.nix +++ b/melodic/industrial-core/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "bf63fe4b823d57a1ea8970db34788b07979c6b6ac549c0dcf587bee582f9798b"; }; - propagatedBuildInputs = [ industrial-msgs simple-message industrial-trajectory-filters industrial-deprecated industrial-utils industrial-robot-client industrial-robot-simulator ]; + propagatedBuildInputs = [ industrial-deprecated industrial-utils industrial-robot-client industrial-msgs simple-message industrial-trajectory-filters industrial-robot-simulator ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS-Industrial core stack contains packages and libraries for supporing industrial systems''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/industrial-deprecated/default.nix b/melodic/industrial-deprecated/default.nix index 2d4e723545..753c93307b 100644 --- a/melodic/industrial-deprecated/default.nix +++ b/melodic/industrial-deprecated/default.nix @@ -19,6 +19,6 @@ buildRosPackage { deprecation. This package is the last place something will end up before being deleted. If you are missing a package/node and find it's contents here, then you should consider a replacement.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/industrial-msgs/default.nix b/melodic/industrial-msgs/default.nix index c61f7a107c..c4cefc52ea 100644 --- a/melodic/industrial-msgs/default.nix +++ b/melodic/industrial-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The industrial message package containes industrial specific messages definitions. This package is part of the ROS-Industrial program.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/industrial-robot-client/default.nix b/melodic/industrial-robot-client/default.nix index e29c542b8a..ff43fa0349 100644 --- a/melodic/industrial-robot-client/default.nix +++ b/melodic/industrial-robot-client/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''industrial robot client contains generic clients for connecting to industrial robot controllers with servers that adhere to the simple message protocol.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/industrial-robot-simulator/default.nix b/melodic/industrial-robot-simulator/default.nix index b96747238c..d7fb7f3475 100644 --- a/melodic/industrial-robot-simulator/default.nix +++ b/melodic/industrial-robot-simulator/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; checkInputs = [ roslaunch industrial-robot-client ]; - propagatedBuildInputs = [ industrial-msgs control-msgs rospy pythonPackages.rospkg trajectory-msgs sensor-msgs industrial-robot-client ]; + propagatedBuildInputs = [ control-msgs pythonPackages.rospkg trajectory-msgs sensor-msgs industrial-robot-client industrial-msgs rospy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The industrial robot simulator is a stand in for industrial robot driver node(s). It adheres to the driver specification for industrial robot controllers.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/industrial-trajectory-filters/default.nix b/melodic/industrial-trajectory-filters/default.nix index 66a00f57a5..accaeaf16b 100644 --- a/melodic/industrial-trajectory-filters/default.nix +++ b/melodic/industrial-trajectory-filters/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, moveit-ros-planning, orocos-kdl, pluginlib, trajectory-msgs, catkin, moveit-core }: +{ lib, buildRosPackage, fetchurl, moveit-ros-planning, pluginlib, orocos-kdl, trajectory-msgs, catkin, moveit-core }: buildRosPackage { pname = "ros-melodic-industrial-trajectory-filters"; version = "0.7.0"; @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "ce903b69e6712c8ebe654ab523ee627a57881be2c218b5fdb2330d8150520298"; }; - buildInputs = [ moveit-ros-planning moveit-core pluginlib orocos-kdl trajectory-msgs ]; - propagatedBuildInputs = [ moveit-ros-planning moveit-core pluginlib orocos-kdl trajectory-msgs ]; + buildInputs = [ moveit-ros-planning orocos-kdl pluginlib trajectory-msgs moveit-core ]; + propagatedBuildInputs = [ moveit-ros-planning orocos-kdl pluginlib trajectory-msgs moveit-core ]; nativeBuildInputs = [ catkin ]; meta = { @@ -24,6 +24,6 @@ buildRosPackage { This package is part of the ROS Industrial program and contains libraries and moveit plugins for filtering robot trajectories.

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/industrial-utils/default.nix b/melodic/industrial-utils/default.nix index 125fcc6d00..bc460e5f23 100644 --- a/melodic/industrial-utils/default.nix +++ b/melodic/industrial-utils/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Industrial utils is a library package that captures common funcitonality for the ROS-Industrial distribution.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/interactive-marker-proxy/default.nix b/melodic/interactive-marker-proxy/default.nix index c160c2a263..cbb14b881e 100644 --- a/melodic/interactive-marker-proxy/default.nix +++ b/melodic/interactive-marker-proxy/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''A Proxy Server for Interactive Markers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/interactive-marker-tutorials/default.nix b/melodic/interactive-marker-tutorials/default.nix index 6c1d119233..3ecb170f1e 100644 --- a/melodic/interactive-marker-tutorials/default.nix +++ b/melodic/interactive-marker-tutorials/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The interactive_marker_tutorials package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/interactive-markers/default.nix b/melodic/interactive-markers/default.nix index bb6c7a20aa..0c4b9b4533 100644 --- a/melodic/interactive-markers/default.nix +++ b/melodic/interactive-markers/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "600001c06acb4e88fe5c9f512476d50b41a795356643bb02e528748b158b81f8"; }; - buildInputs = [ rostest rosconsole visualization-msgs rospy std-msgs tf roscpp ]; - propagatedBuildInputs = [ rostest rosconsole visualization-msgs rospy std-msgs tf roscpp ]; + buildInputs = [ rosconsole roscpp rostest visualization-msgs rospy std-msgs tf ]; + propagatedBuildInputs = [ rosconsole roscpp rostest visualization-msgs rospy std-msgs tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''3D interactive marker communication library for RViz and similar tools.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/interval-intersection/default.nix b/melodic/interval-intersection/default.nix index a225645f0f..20eeae6f31 100644 --- a/melodic/interval-intersection/default.nix +++ b/melodic/interval-intersection/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rosconsole, actionlib-msgs, boost, catkin, roscpp, roscpp-serialization, actionlib, std-msgs, rostime, geometry-msgs, calibration-msgs }: +{ lib, buildRosPackage, fetchurl, rosconsole, actionlib-msgs, boost, catkin, roscpp, actionlib, roscpp-serialization, std-msgs, rostime, geometry-msgs, calibration-msgs }: buildRosPackage { pname = "ros-melodic-interval-intersection"; version = "0.10.14"; @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "4466aa2fd48b25d0fa963f756b1ed3c5bb4bcba29d9dc1fc6d392d2dfe4685a5"; }; - buildInputs = [ rosconsole boost actionlib-msgs roscpp roscpp-serialization actionlib std-msgs rostime geometry-msgs calibration-msgs ]; - propagatedBuildInputs = [ rosconsole boost actionlib-msgs roscpp roscpp-serialization actionlib std-msgs rostime geometry-msgs calibration-msgs ]; + buildInputs = [ rosconsole boost actionlib-msgs roscpp actionlib roscpp-serialization std-msgs rostime geometry-msgs calibration-msgs ]; + propagatedBuildInputs = [ rosconsole boost actionlib-msgs roscpp actionlib roscpp-serialization std-msgs rostime geometry-msgs calibration-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Tools for calculating the intersection of interval messages coming in on several topics. This package is experimental and unstable. Expect its APIs to change.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ipr-extern/default.nix b/melodic/ipr-extern/default.nix index 5b8b0a2149..f03aaf88a2 100644 --- a/melodic/ipr-extern/default.nix +++ b/melodic/ipr-extern/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Package with external libraries used in Industrial and Service workspaces. Currentlly supported Libraries: Reflexxes, Libmodbus.''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/ivcon/default.nix b/melodic/ivcon/default.nix index a3db07fd69..fbf8f81ae9 100644 --- a/melodic/ivcon/default.nix +++ b/melodic/ivcon/default.nix @@ -22,6 +22,6 @@ been changed since 2001 and appears to be very stable. We plan on keeping this package in this revision for mesh conversions. This package is only available as a single source file for download. There are no local modifications to this package.''; - #license = lib.licenses.GPL; + license = with lib.licenses; [ gpl1 ]; }; } diff --git a/melodic/joint-limits-interface/default.nix b/melodic/joint-limits-interface/default.nix index cdee07ac83..cca533d3c7 100644 --- a/melodic/joint-limits-interface/default.nix +++ b/melodic/joint-limits-interface/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Interface for enforcing joint limits.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/joint-state-controller/default.nix b/melodic/joint-state-controller/default.nix index 157713a6df..416bc5528d 100644 --- a/melodic/joint-state-controller/default.nix +++ b/melodic/joint-state-controller/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "97c1c877b5f1f3fd9377c0c1e8a8fb5ef9b2ab05957d3469d25300bb088e937e"; }; - buildInputs = [ hardware-interface controller-interface pluginlib realtime-tools sensor-msgs roscpp ]; + buildInputs = [ hardware-interface pluginlib realtime-tools sensor-msgs controller-interface roscpp ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ hardware-interface controller-interface pluginlib realtime-tools sensor-msgs roscpp ]; + propagatedBuildInputs = [ hardware-interface pluginlib realtime-tools sensor-msgs controller-interface roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Controller to publish joint state''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/joint-state-publisher/default.nix b/melodic/joint-state-publisher/default.nix index 9cd8cbebe7..d71b20e0cc 100644 --- a/melodic/joint-state-publisher/default.nix +++ b/melodic/joint-state-publisher/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains a tool for setting and publishing joint state values for a given URDF.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/joint-states-settler/default.nix b/melodic/joint-states-settler/default.nix index ad6c2d648d..df2f57a786 100644 --- a/melodic/joint-states-settler/default.nix +++ b/melodic/joint-states-settler/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "7625fdf3c7c87b21dd67a05f53faa5d09926c6065251b5d761b1ec3a23f79654"; }; - buildInputs = [ settlerlib actionlib rosconsole actionlib-msgs roscpp-serialization std-msgs roscpp ]; - propagatedBuildInputs = [ settlerlib actionlib rosconsole actionlib-msgs roscpp-serialization std-msgs roscpp ]; + buildInputs = [ rosconsole actionlib-msgs settlerlib actionlib roscpp-serialization std-msgs roscpp ]; + propagatedBuildInputs = [ rosconsole actionlib-msgs settlerlib actionlib roscpp-serialization std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { @@ -21,6 +21,6 @@ buildRosPackage { settled. That is, it calculates how long a set of joints has remained within a specified threshold. This package is experimental and unstable. Expect its APIs to change.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/joint-trajectory-action-tools/default.nix b/melodic/joint-trajectory-action-tools/default.nix index 2401f376ea..68e3492140 100644 --- a/melodic/joint-trajectory-action-tools/default.nix +++ b/melodic/joint-trajectory-action-tools/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "cff217c086340f75d87f968fe96ab08c5485fb39779aa8d1af8699bcb993f356"; }; - buildInputs = [ pr2-controllers-msgs rospy joint-trajectory-action trajectory-msgs roslib ]; - propagatedBuildInputs = [ pr2-controllers-msgs rospy joint-trajectory-action trajectory-msgs roslib ]; + buildInputs = [ pr2-controllers-msgs joint-trajectory-action trajectory-msgs rospy roslib ]; + propagatedBuildInputs = [ pr2-controllers-msgs joint-trajectory-action trajectory-msgs rospy roslib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''joint_trajectory_action_tools''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/joint-trajectory-action/default.nix b/melodic/joint-trajectory-action/default.nix index e5a71671d3..fc4cc85423 100644 --- a/melodic/joint-trajectory-action/default.nix +++ b/melodic/joint-trajectory-action/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The joint_trajectory_action is a node that exposes an action interface to a joint trajectory controller.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/joint-trajectory-controller/default.nix b/melodic/joint-trajectory-controller/default.nix index f261afb757..2900762a6d 100644 --- a/melodic/joint-trajectory-controller/default.nix +++ b/melodic/joint-trajectory-controller/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "d7624bbbca732b5e17524908ec9e6214c448aa9cc33ffddb3538e9269c6bd313"; }; - buildInputs = [ hardware-interface cmake-modules control-msgs realtime-tools control-toolbox trajectory-msgs controller-interface urdf actionlib angles roscpp ]; + buildInputs = [ hardware-interface cmake-modules control-msgs trajectory-msgs realtime-tools control-toolbox controller-interface urdf actionlib angles roscpp ]; checkInputs = [ controller-manager rostest xacro ]; - propagatedBuildInputs = [ hardware-interface control-msgs realtime-tools control-toolbox trajectory-msgs controller-interface urdf actionlib angles roscpp ]; + propagatedBuildInputs = [ hardware-interface control-msgs trajectory-msgs realtime-tools control-toolbox controller-interface urdf actionlib angles roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Controller for executing joint-space trajectories on a group of joints.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/joint-trajectory-generator/default.nix b/melodic/joint-trajectory-generator/default.nix index 050422528b..42dbef6e68 100644 --- a/melodic/joint-trajectory-generator/default.nix +++ b/melodic/joint-trajectory-generator/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "273943f65776908254c198a36be8792716e78e5487d52e849be32aa66094695d"; }; - buildInputs = [ pr2-controllers-msgs urdf orocos-kdl actionlib joint-trajectory-action angles roscpp ]; - propagatedBuildInputs = [ pr2-controllers-msgs urdf orocos-kdl actionlib joint-trajectory-action angles roscpp ]; + buildInputs = [ pr2-controllers-msgs orocos-kdl joint-trajectory-action urdf actionlib angles roscpp ]; + propagatedBuildInputs = [ pr2-controllers-msgs orocos-kdl joint-trajectory-action urdf actionlib angles roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''joint_trajectory_generator action takes in a trajectory specified by a number of joint positions, and it generates a new smooth trajectory through these joint positions.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/joy-listener/default.nix b/melodic/joy-listener/default.nix index af0d3c0df7..96221972a5 100644 --- a/melodic/joy-listener/default.nix +++ b/melodic/joy-listener/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Translates joy msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/joy-teleop/default.nix b/melodic/joy-teleop/default.nix index 89cce4aece..380dff10a3 100644 --- a/melodic/joy-teleop/default.nix +++ b/melodic/joy-teleop/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "36f191ff3945af0b25a599fecf08a999b1d7bdf91e0f387775a3e6adda9be052"; }; - propagatedBuildInputs = [ rostopic actionlib rospy sensor-msgs teleop-tools-msgs ]; + propagatedBuildInputs = [ sensor-msgs teleop-tools-msgs actionlib rostopic rospy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A (to be) generic joystick interface to control a robot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/joy/default.nix b/melodic/joy/default.nix index 8af9bc52fb..64fa67016c 100644 --- a/melodic/joy/default.nix +++ b/melodic/joy/default.nix @@ -23,6 +23,6 @@ buildRosPackage { generic Linux joystick to ROS. This node publishes a "Joy" message, which contains the current state of each one of the joystick's buttons and axes.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/joystick-drivers/default.nix b/melodic/joystick-drivers/default.nix index bc5c52550b..28815a31d8 100644 --- a/melodic/joystick-drivers/default.nix +++ b/melodic/joystick-drivers/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This metapackage depends on packages for interfacing common joysticks and human input devices with ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jpeg-streamer/default.nix b/melodic/jpeg-streamer/default.nix index 2ac319bfd8..965963f301 100644 --- a/melodic/jpeg-streamer/default.nix +++ b/melodic/jpeg-streamer/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''tools for streaming JPEG-formatted CompressedImage topics over HTTP''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-3rdparty/default.nix b/melodic/jsk-3rdparty/default.nix index edb3421ed0..e5933fd642 100644 --- a/melodic/jsk-3rdparty/default.nix +++ b/melodic/jsk-3rdparty/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''

    Metapackage that contains commonly used 3rdparty toolset for jsk-ros-pkg

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-common-msgs/default.nix b/melodic/jsk-common-msgs/default.nix index e14c69584e..4f10f36f71 100644 --- a/melodic/jsk-common-msgs/default.nix +++ b/melodic/jsk-common-msgs/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "3b58085e4249a1b809d2e657158c595336460295578ba0cfe369f8006f0cfc85"; }; - propagatedBuildInputs = [ speech-recognition-msgs jsk-hark-msgs jsk-footstep-msgs posedetection-msgs jsk-gui-msgs ]; + propagatedBuildInputs = [ speech-recognition-msgs jsk-hark-msgs jsk-footstep-msgs jsk-gui-msgs posedetection-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''

    Metapackage that contains commonly used messages for jsk-ros-pkg

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-common/default.nix b/melodic/jsk-common/default.nix index c5685d4b48..934a8716a5 100644 --- a/melodic/jsk-common/default.nix +++ b/melodic/jsk-common/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, image-view2, catkin, jsk-tilt-laser, jsk-topic-tools, jsk-network-tools, dynamic-tf-publisher, jsk-tools, virtual-force-publisher, multi-map-server }: +{ lib, buildRosPackage, fetchurl, image-view2, catkin, jsk-topic-tools, jsk-tilt-laser, jsk-network-tools, dynamic-tf-publisher, jsk-tools, virtual-force-publisher, multi-map-server }: buildRosPackage { pname = "ros-melodic-jsk-common"; version = "2.2.10"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "f199dfa0fec8ff6d0e253344ab11deb511b0d1f300f4473845803b2a1c54db2f"; }; - propagatedBuildInputs = [ jsk-network-tools image-view2 dynamic-tf-publisher jsk-tools jsk-tilt-laser virtual-force-publisher jsk-topic-tools multi-map-server ]; + propagatedBuildInputs = [ image-view2 jsk-topic-tools jsk-tilt-laser jsk-network-tools dynamic-tf-publisher jsk-tools virtual-force-publisher multi-map-server ]; nativeBuildInputs = [ catkin ]; meta = { description = ''

    Metapackage that contains commonly used toolset for jsk-ros-pkg

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-footstep-msgs/default.nix b/melodic/jsk-footstep-msgs/default.nix index 6394755fdf..bef5313cd5 100644 --- a/melodic/jsk-footstep-msgs/default.nix +++ b/melodic/jsk-footstep-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''jsk_footstep_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-gui-msgs/default.nix b/melodic/jsk-gui-msgs/default.nix index 20922b4490..0a79a5b31f 100644 --- a/melodic/jsk-gui-msgs/default.nix +++ b/melodic/jsk-gui-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''jsk_gui_msgs''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/jsk-hark-msgs/default.nix b/melodic/jsk-hark-msgs/default.nix index 60d4997017..fdc89caca9 100644 --- a/melodic/jsk-hark-msgs/default.nix +++ b/melodic/jsk-hark-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''jsk_hark_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-interactive-marker/default.nix b/melodic/jsk-interactive-marker/default.nix index 87e1afe32d..1d8ed7e2e4 100644 --- a/melodic/jsk-interactive-marker/default.nix +++ b/melodic/jsk-interactive-marker/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "9d011fe79c6eda3b54a31289ca6fa2073bd601771d4a788195992a87741f3a9a"; }; - buildInputs = [ roseus mk rosbuild tinyxml dynamic-tf-publisher jsk-rviz-plugins urdf jsk-recognition-msgs actionlib tf-conversions moveit-msgs tf roscpp visualization-msgs geometry-msgs cmake-modules libyamlcpp sensor-msgs jsk-footstep-msgs message-filters jsk-topic-tools message-generation rviz interactive-markers jsk-recognition-utils dynamic-reconfigure eigen-conversions roslib ]; - propagatedBuildInputs = [ roseus tinyxml dynamic-tf-publisher jsk-rviz-plugins urdf jsk-recognition-msgs actionlib tf-conversions moveit-msgs tf roscpp visualization-msgs geometry-msgs libyamlcpp sensor-msgs jsk-footstep-msgs message-filters jsk-topic-tools rviz message-runtime interactive-markers dynamic-reconfigure jsk-recognition-utils eigen-conversions roslib ]; + buildInputs = [ tinyxml dynamic-tf-publisher actionlib tf-conversions tf geometry-msgs jsk-footstep-msgs message-filters jsk-topic-tools message-generation rviz eigen-conversions roslib roseus mk rosbuild jsk-rviz-plugins urdf jsk-recognition-msgs moveit-msgs roscpp visualization-msgs cmake-modules libyamlcpp sensor-msgs interactive-markers jsk-recognition-utils dynamic-reconfigure ]; + propagatedBuildInputs = [ tinyxml dynamic-tf-publisher actionlib tf-conversions tf geometry-msgs jsk-footstep-msgs message-filters jsk-topic-tools rviz message-runtime eigen-conversions roslib roseus jsk-rviz-plugins urdf jsk-recognition-msgs moveit-msgs roscpp visualization-msgs libyamlcpp sensor-msgs interactive-markers jsk-recognition-utils dynamic-reconfigure ]; nativeBuildInputs = [ catkin ]; meta = { description = ''jsk interactive markers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-interactive-test/default.nix b/melodic/jsk-interactive-test/default.nix index f2aac0d3b7..c0cf78fcae 100644 --- a/melodic/jsk-interactive-test/default.nix +++ b/melodic/jsk-interactive-test/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "5f1a01af87786761626dae0bf1e263553bcdf2e57234cbe55f1273dc523d1104"; }; - buildInputs = [ jsk-interactive-marker visualization-msgs rospy mk rosbuild jsk-interactive ]; + buildInputs = [ mk rosbuild jsk-interactive-marker rospy visualization-msgs jsk-interactive ]; propagatedBuildInputs = [ rviz jsk-interactive-marker rospy visualization-msgs jsk-interactive ]; nativeBuildInputs = [ catkin ]; meta = { description = ''jsk_interactive_test''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-interactive/default.nix b/melodic/jsk-interactive/default.nix index a64c59e004..bd78807fc5 100644 --- a/melodic/jsk-interactive/default.nix +++ b/melodic/jsk-interactive/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "739be630c6e56f915493551f092539377bfc8a224ddc9952b517e223952af8eb"; }; - buildInputs = [ dynamic-tf-publisher jsk-interactive-marker visualization-msgs actionlib rospy mk rosbuild geometry-msgs ]; + buildInputs = [ mk rosbuild dynamic-tf-publisher jsk-interactive-marker actionlib rospy visualization-msgs geometry-msgs ]; propagatedBuildInputs = [ dynamic-tf-publisher jsk-interactive-marker actionlib rospy visualization-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''jsk_interactive''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-model-tools/default.nix b/melodic/jsk-model-tools/default.nix index 8bbaa328cf..d8665a710e 100644 --- a/melodic/jsk-model-tools/default.nix +++ b/melodic/jsk-model-tools/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''

    Metapackage that contains model_tools package for jsk-ros-pkg

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-network-tools/default.nix b/melodic/jsk-network-tools/default.nix index fbb1c647e4..6a644c4d7f 100644 --- a/melodic/jsk-network-tools/default.nix +++ b/melodic/jsk-network-tools/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ sensor-msgs rospy diagnostic-updater rostest message-generation dynamic-reconfigure std-msgs diagnostic-msgs roscpp ]; - propagatedBuildInputs = [ diagnostic-updater message-runtime dynamic-reconfigure std-msgs diagnostic-msgs sensor-msgs roscpp rospy ]; + propagatedBuildInputs = [ sensor-msgs rospy diagnostic-updater message-runtime dynamic-reconfigure std-msgs diagnostic-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''jsk_network_tools''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-pcl-ros-utils/default.nix b/melodic/jsk-pcl-ros-utils/default.nix index fdbea4531b..8ba643561f 100644 --- a/melodic/jsk-pcl-ros-utils/default.nix +++ b/melodic/jsk-pcl-ros-utils/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ROS utility nodelets for pointcloud perception.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-pcl-ros/default.nix b/melodic/jsk-pcl-ros/default.nix index ecb9a8d9af..9f9ec64a0c 100644 --- a/melodic/jsk-pcl-ros/default.nix +++ b/melodic/jsk-pcl-ros/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, cv-bridge, image-geometry, octomap, jsk-interactive-marker, jsk-tools, pcl-ros, moveit-ros-perception, diagnostic-msgs, jsk-pcl-ros-utils, tf-conversions, tf, pcl-conversions, jsk-perception, geometry-msgs, laser-assembler, stereo-msgs, boost, robot-self-filter, image-transport, jsk-footstep-msgs, jsk-topic-tools, pythonPackages, resized-image-transport, openni-launch, moveit-core, jsk-data, pcl-msgs, eigen-conversions, roslaunch, kdl-conversions, std-srvs, catkin, checkerboard-detector, tf2-ros, nav-msgs, jsk-recognition-msgs, std-msgs, openni2-launch, nodelet, visualization-msgs, octomap-server, rosboost-cfg, stereo-image-proc, kdl-parser, image-view2, roscpp-tutorials, libyamlcpp, sensor-msgs, diagnostic-updater, rostest, interactive-markers, jsk-recognition-utils, dynamic-reconfigure, topic-tools }: +{ lib, buildRosPackage, fetchurl, cv-bridge, image-geometry, octomap, jsk-interactive-marker, jsk-tools, pcl-ros, moveit-ros-perception, diagnostic-msgs, jsk-pcl-ros-utils, tf-conversions, tf, pcl-conversions, jsk-perception, geometry-msgs, laser-assembler, stereo-msgs, boost, robot-self-filter, image-transport, jsk-footstep-msgs, jsk-topic-tools, pythonPackages, resized-image-transport, openni-launch, moveit-core, jsk-data, pcl-msgs, eigen-conversions, roslaunch, kdl-conversions, std-srvs, catkin, checkerboard-detector, tf2-ros, nav-msgs, jsk-recognition-msgs, std-msgs, openni2-launch, nodelet, visualization-msgs, octomap-server, rosboost-cfg, image-view2, kdl-parser, roscpp-tutorials, stereo-image-proc, libyamlcpp, sensor-msgs, diagnostic-updater, rostest, interactive-markers, jsk-recognition-utils, dynamic-reconfigure, topic-tools }: buildRosPackage { pname = "ros-melodic-jsk-pcl-ros"; version = "1.2.10"; @@ -14,11 +14,11 @@ buildRosPackage { buildInputs = [ laser-assembler octomap-server libyamlcpp cv-bridge jsk-topic-tools pcl-msgs image-geometry interactive-markers jsk-recognition-utils pcl-ros moveit-ros-perception jsk-pcl-ros-utils tf-conversions tf jsk-data ]; checkInputs = [ rostest roslaunch jsk-tools jsk-perception ]; - propagatedBuildInputs = [ cv-bridge image-geometry octomap jsk-interactive-marker pcl-ros tf-conversions jsk-pcl-ros-utils moveit-ros-perception tf pcl-conversions diagnostic-msgs geometry-msgs stereo-msgs laser-assembler boost robot-self-filter image-transport jsk-footstep-msgs jsk-topic-tools resized-image-transport openni-launch moveit-core jsk-data pcl-msgs eigen-conversions kdl-conversions std-srvs checkerboard-detector tf2-ros nav-msgs jsk-recognition-msgs std-msgs openni2-launch nodelet visualization-msgs octomap-server stereo-image-proc image-view2 rosboost-cfg roscpp-tutorials kdl-parser libyamlcpp sensor-msgs pythonPackages.scikitlearn diagnostic-updater interactive-markers jsk-recognition-utils dynamic-reconfigure topic-tools ]; + propagatedBuildInputs = [ cv-bridge image-geometry octomap jsk-interactive-marker pcl-ros tf-conversions jsk-pcl-ros-utils moveit-ros-perception tf pcl-conversions diagnostic-msgs geometry-msgs stereo-msgs laser-assembler boost robot-self-filter image-transport jsk-footstep-msgs jsk-topic-tools resized-image-transport openni-launch moveit-core jsk-data pcl-msgs eigen-conversions kdl-conversions std-srvs checkerboard-detector tf2-ros nav-msgs jsk-recognition-msgs std-msgs openni2-launch nodelet visualization-msgs octomap-server image-view2 rosboost-cfg roscpp-tutorials kdl-parser stereo-image-proc libyamlcpp sensor-msgs pythonPackages.scikitlearn diagnostic-updater interactive-markers jsk-recognition-utils dynamic-reconfigure topic-tools ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS nodelets for pointcloud perception.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-recognition-msgs/default.nix b/melodic/jsk-recognition-msgs/default.nix index cd5d2accb5..634a854d40 100644 --- a/melodic/jsk-recognition-msgs/default.nix +++ b/melodic/jsk-recognition-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "29666d54c5db407b249a6233047344608e66d1760ad1576db9148dcec5255a87"; }; - buildInputs = [ message-generation jsk-footstep-msgs pcl-msgs std-msgs sensor-msgs geometry-msgs ]; - propagatedBuildInputs = [ message-generation jsk-footstep-msgs pcl-msgs std-msgs sensor-msgs geometry-msgs ]; + buildInputs = [ sensor-msgs jsk-footstep-msgs message-generation pcl-msgs std-msgs geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs jsk-footstep-msgs message-generation pcl-msgs std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS messages for jsk_pcl_ros and jsk_perception.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-recognition-utils/default.nix b/melodic/jsk-recognition-utils/default.nix index 3aa7f94549..1bb01717ca 100644 --- a/melodic/jsk-recognition-utils/default.nix +++ b/melodic/jsk-recognition-utils/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''C++ library about sensor model, geometrical modeling and perception.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-recognition/default.nix b/melodic/jsk-recognition/default.nix index 330ca5eead..4fbe9f62bf 100644 --- a/melodic/jsk-recognition/default.nix +++ b/melodic/jsk-recognition/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, jsk-pcl-ros, catkin, checkerboard-detector, resized-image-transport, jsk-recognition-utils, jsk-recognition-msgs, jsk-perception, imagesift }: +{ lib, buildRosPackage, fetchurl, jsk-pcl-ros, catkin, checkerboard-detector, resized-image-transport, jsk-recognition-msgs, jsk-recognition-utils, jsk-perception, imagesift }: buildRosPackage { pname = "ros-melodic-jsk-recognition"; version = "1.2.10"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "abcd88e0a0d3f5f13a04503b9910baa644e4f6044ba3987b0026eac7c198a88d"; }; - propagatedBuildInputs = [ jsk-pcl-ros jsk-recognition-utils jsk-recognition-msgs resized-image-transport checkerboard-detector jsk-perception imagesift ]; + propagatedBuildInputs = [ jsk-pcl-ros checkerboard-detector resized-image-transport jsk-recognition-msgs jsk-recognition-utils jsk-perception imagesift ]; nativeBuildInputs = [ catkin ]; meta = { description = ''

    Metapackage that contains recognition package for jsk-ros-pkg

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-roseus/default.nix b/melodic/jsk-roseus/default.nix index cde5501c67..55f022ef46 100644 --- a/melodic/jsk-roseus/default.nix +++ b/melodic/jsk-roseus/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''

    Metapackage that contains roseus package for jsk-ros-pkg

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-rqt-plugins/default.nix b/melodic/jsk-rqt-plugins/default.nix index 21f39879c6..ffe1930e3c 100644 --- a/melodic/jsk-rqt-plugins/default.nix +++ b/melodic/jsk-rqt-plugins/default.nix @@ -14,11 +14,11 @@ buildRosPackage { buildInputs = [ mk image-view2 message-generation rosbuild ]; checkInputs = [ rostest roslaunch ]; - propagatedBuildInputs = [ image-pipeline rqt-gui-py image-view2 pythonPackages.urlgrabber pythonPackages.scikitlearn rqt-gui jsk-gui-msgs cv-bridge resource-retriever message-runtime rqt-image-view rqt-plot qt-gui-py-common ]; + propagatedBuildInputs = [ image-pipeline rqt-gui-py image-view2 pythonPackages.urlgrabber rqt-gui pythonPackages.scikitlearn jsk-gui-msgs cv-bridge resource-retriever message-runtime rqt-image-view rqt-plot qt-gui-py-common ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The jsk_rqt_plugins package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-rviz-plugins/default.nix b/melodic/jsk-rviz-plugins/default.nix index 7133bf2fbb..1033fd8fc8 100644 --- a/melodic/jsk-rviz-plugins/default.nix +++ b/melodic/jsk-rviz-plugins/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "c1c50044f24196bb50fc782cb407e7ed9c8540a7525c6f305b0ec44641d74f27"; }; - buildInputs = [ people-msgs mk cv-bridge jsk-gui-msgs rosbuild image-geometry view-controller-msgs jsk-recognition-msgs diagnostic-msgs std-msgs geometry-msgs urdfdom-py jsk-hark-msgs jsk-footstep-msgs jsk-topic-tools message-generation rviz jsk-recognition-utils dynamic-reconfigure ]; - propagatedBuildInputs = [ people-msgs cv-bridge posedetection-msgs jsk-gui-msgs pythonPackages.scipy image-geometry view-controller-msgs jsk-recognition-msgs diagnostic-msgs image-publisher std-msgs geometry-msgs urdfdom-py jsk-hark-msgs jsk-footstep-msgs jsk-topic-tools message-generation rviz jsk-recognition-utils dynamic-reconfigure ]; + buildInputs = [ cv-bridge jsk-gui-msgs image-geometry view-controller-msgs diagnostic-msgs geometry-msgs jsk-hark-msgs jsk-footstep-msgs jsk-topic-tools message-generation rviz people-msgs mk rosbuild jsk-recognition-msgs std-msgs urdfdom-py jsk-recognition-utils dynamic-reconfigure ]; + propagatedBuildInputs = [ cv-bridge jsk-gui-msgs pythonPackages.scipy image-geometry view-controller-msgs diagnostic-msgs geometry-msgs jsk-hark-msgs jsk-footstep-msgs jsk-topic-tools message-generation rviz people-msgs posedetection-msgs jsk-recognition-msgs image-publisher std-msgs urdfdom-py jsk-recognition-utils dynamic-reconfigure ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The jsk_rviz_plugins package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-tilt-laser/default.nix b/melodic/jsk-tilt-laser/default.nix index 5a57dd6713..57125c8baa 100644 --- a/melodic/jsk-tilt-laser/default.nix +++ b/melodic/jsk-tilt-laser/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "900a78c35d33c6dc2e243480f4ef04df27f1a1773184bd64c16b83c313adb438"; }; - buildInputs = [ laser-assembler laser-filters cmake-modules dynamic-reconfigure tf-conversions sensor-msgs tf ]; - propagatedBuildInputs = [ laser-assembler urg-node laser-filters robot-state-publisher dynamic-reconfigure tf-conversions sensor-msgs tf ]; + buildInputs = [ laser-assembler cmake-modules sensor-msgs laser-filters dynamic-reconfigure tf-conversions tf ]; + propagatedBuildInputs = [ laser-assembler urg-node sensor-msgs laser-filters robot-state-publisher dynamic-reconfigure tf-conversions tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The jsk_tilt_laser package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-topic-tools/default.nix b/melodic/jsk-topic-tools/default.nix index b3b9be25a3..e88977dba4 100644 --- a/melodic/jsk-topic-tools/default.nix +++ b/melodic/jsk-topic-tools/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "d2f76dd70a0b02a05b56658211cc0c8441dca5bea008d0ea45694d3c4cefa5e7"; }; - buildInputs = [ roslaunch std-srvs dynamic-tf-publisher std-msgs diagnostic-msgs roscpp nodelet tf geometry-msgs rosnode image-transport diagnostic-updater rostest message-generation rostopic dynamic-reconfigure topic-tools eigen-conversions rostime ]; + buildInputs = [ dynamic-tf-publisher diagnostic-msgs tf geometry-msgs image-transport message-generation eigen-conversions rostime roslaunch std-srvs std-msgs roscpp nodelet rosnode diagnostic-updater rostest rostopic dynamic-reconfigure topic-tools ]; checkInputs = [ roscpp-tutorials roslint ]; - propagatedBuildInputs = [ std-srvs pythonPackages.numpy pythonPackages.scipy pythonPackages.opencv3 dynamic-tf-publisher std-msgs diagnostic-msgs roscpp nodelet tf geometry-msgs rosnode image-transport sensor-msgs eigen-conversions sound-play diagnostic-updater message-runtime rostopic dynamic-reconfigure topic-tools roslaunch rostime ]; + propagatedBuildInputs = [ pythonPackages.scipy dynamic-tf-publisher diagnostic-msgs tf geometry-msgs image-transport sound-play message-runtime roslaunch rostime eigen-conversions std-srvs pythonPackages.numpy pythonPackages.opencv3 std-msgs roscpp nodelet rosnode sensor-msgs diagnostic-updater rostopic dynamic-reconfigure topic-tools ]; nativeBuildInputs = [ catkin ]; meta = { description = ''jsk_topic_tools''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jsk-visualization/default.nix b/melodic/jsk-visualization/default.nix index dc24c90d30..72ccad7a51 100644 --- a/melodic/jsk-visualization/default.nix +++ b/melodic/jsk-visualization/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "6a77306292fe2644e5cd6ad9df30e442aa904f920bc373a0b8b5ff9a2d0e0411"; }; - propagatedBuildInputs = [ jsk-rviz-plugins jsk-rqt-plugins jsk-interactive-marker jsk-interactive-test jsk-interactive ]; + propagatedBuildInputs = [ jsk-rqt-plugins jsk-interactive-test jsk-rviz-plugins jsk-interactive-marker jsk-interactive ]; nativeBuildInputs = [ catkin ]; meta = { description = ''

    Metapackage that contains visualization package for jsk-ros-pkg

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/jskeus/default.nix b/melodic/jskeus/default.nix index b597ac1ec3..2bc35fcdab 100644 --- a/melodic/jskeus/default.nix +++ b/melodic/jskeus/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''EusLisp software developed and used by JSK at The University of Tokyo''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/json-msgs/default.nix b/melodic/json-msgs/default.nix index c016073c9c..dff7938af8 100644 --- a/melodic/json-msgs/default.nix +++ b/melodic/json-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''JSON ROS message''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/json-transport/default.nix b/melodic/json-transport/default.nix index e4492e8c9d..383b263e60 100644 --- a/melodic/json-transport/default.nix +++ b/melodic/json-transport/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''JSON transport for ROS''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/julius/default.nix b/melodic/julius/default.nix index 032baa3f4a..e5ee2a5819 100644 --- a/melodic/julius/default.nix +++ b/melodic/julius/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "45f762799ae7c4ec3acf064e4e13afc43b0556a2c410b30c84df92fe62ef51bd"; }; - buildInputs = [ roslib rospack unzip mk rsync wget ]; + buildInputs = [ rospack mk rsync wget unzip roslib ]; propagatedBuildInputs = [ rsync unzip wget ]; nativeBuildInputs = [ catkin ]; meta = { description = ''julius: Open-Source Large Vocabulary CSR Engine (http://julius.sourceforge.jp/index.php)''; - #license = lib.licenses.GPL; + license = with lib.licenses; [ gpl1 ]; }; } diff --git a/melodic/kalman-filter/default.nix b/melodic/kalman-filter/default.nix index 6d5d2b2648..505eab516c 100644 --- a/melodic/kalman-filter/default.nix +++ b/melodic/kalman-filter/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Simple Kalman Filter in Python''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/kartech-linear-actuator-msgs/default.nix b/melodic/kartech-linear-actuator-msgs/default.nix index a154433067..72e20bc056 100644 --- a/melodic/kartech-linear-actuator-msgs/default.nix +++ b/melodic/kartech-linear-actuator-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The kartech_linear_actuator_msgs package''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/kdl-conversions/default.nix b/melodic/kdl-conversions/default.nix index d351e88e6f..e6d5d89282 100644 --- a/melodic/kdl-conversions/default.nix +++ b/melodic/kdl-conversions/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Conversion functions between KDL and geometry_msgs types.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/kdl-parser-py/default.nix b/melodic/kdl-parser-py/default.nix index dbd9d6518c..fc54ec199b 100644 --- a/melodic/kdl-parser-py/default.nix +++ b/melodic/kdl-parser-py/default.nix @@ -22,6 +22,6 @@ buildRosPackage { to represent the kinematic and dynamic parameters of a robot mechanism. kdl_parser_py provides Python tools to construct a KDL tree from an XML robot representation in URDF.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/kdl-parser/default.nix b/melodic/kdl-parser/default.nix index 048df6ecbc..5a82b3a0f9 100644 --- a/melodic/kdl-parser/default.nix +++ b/melodic/kdl-parser/default.nix @@ -12,9 +12,9 @@ buildRosPackage { sha256 = "5931eb562bb310633fedf3c2e40b435cfa6a8d25caddb4077c04932c66c2a8a9"; }; - buildInputs = [ urdfdom-headers urdf orocos-kdl cmake-modules rosconsole tinyxml-2 tinyxml ]; + buildInputs = [ orocos-kdl cmake-modules rosconsole tinyxml urdfdom-headers urdf tinyxml-2 ]; checkInputs = [ rostest roscpp ]; - propagatedBuildInputs = [ urdfdom-headers urdf orocos-kdl rosconsole tinyxml-2 tinyxml ]; + propagatedBuildInputs = [ orocos-kdl rosconsole tinyxml urdfdom-headers urdf tinyxml-2 ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { to represent the kinematic and dynamic parameters of a robot mechanism. kdl_parser provides tools to construct a KDL tree from an XML robot representation in URDF.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/key-teleop/default.nix b/melodic/key-teleop/default.nix index 497ef14ddf..0f39d5408b 100644 --- a/melodic/key-teleop/default.nix +++ b/melodic/key-teleop/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A text-based interface to send a robot movement commands''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/kinesis-manager/default.nix b/melodic/kinesis-manager/default.nix index e67f9959f7..38cac6043f 100644 --- a/melodic/kinesis-manager/default.nix +++ b/melodic/kinesis-manager/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "455faeba33ec5a7f671ac3311e0afb2a4a6081da7a36cf5fdddbd83704b95b39"; }; - buildInputs = [ aws-common boost curl openssl log4cplus ]; + buildInputs = [ boost log4cplus aws-common curl openssl ]; checkInputs = [ gtest ]; - propagatedBuildInputs = [ aws-common boost curl openssl log4cplus ]; + propagatedBuildInputs = [ boost log4cplus aws-common curl openssl ]; nativeBuildInputs = [ cmake pkg-config ]; meta = { description = ''AWS Kinesis stream management library intended for use with the Kinesis Video Producer SDK''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/kinesis-video-msgs/default.nix b/melodic/kinesis-video-msgs/default.nix index 2f810b3623..a7d3829baa 100644 --- a/melodic/kinesis-video-msgs/default.nix +++ b/melodic/kinesis-video-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages for transmitting video frames to Kinesis Video Streams''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/kinesis-video-streamer/default.nix b/melodic/kinesis-video-streamer/default.nix index 510e47092b..b947faf4d3 100644 --- a/melodic/kinesis-video-streamer/default.nix +++ b/melodic/kinesis-video-streamer/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Kinesis Video Streams producer node''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/kobuki-core/default.nix b/melodic/kobuki-core/default.nix index 2c650eefa7..b14faa1b5b 100644 --- a/melodic/kobuki-core/default.nix +++ b/melodic/kobuki-core/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Non-ROS software for Kobuki, Yujin Robot's mobile research base.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/kobuki-dock-drive/default.nix b/melodic/kobuki-dock-drive/default.nix index 2a2d361d17..c80ae7d986 100644 --- a/melodic/kobuki-dock-drive/default.nix +++ b/melodic/kobuki-dock-drive/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Dock driving library for Kobuki. Users owning a docking station for Kobuki can use this tool to develop autonomous docking drive algorithms.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/kobuki-driver/default.nix b/melodic/kobuki-driver/default.nix index 180cfc8a23..e508e6bd5e 100644 --- a/melodic/kobuki-driver/default.nix +++ b/melodic/kobuki-driver/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ecl-converters, ecl-sigslots, ecl-command-line, ecl-mobile-robot, catkin, ecl-geometry, ecl-build, ecl-time, ecl-devices }: +{ lib, buildRosPackage, fetchurl, ecl-converters, ecl-sigslots, ecl-mobile-robot, ecl-command-line, catkin, ecl-geometry, ecl-time, ecl-build, ecl-devices }: buildRosPackage { pname = "ros-melodic-kobuki-driver"; version = "0.7.8"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "7cfcc4b9309c4a352fa54c9a6cb0fb0b53a5da43a0243aa13556670ec97bd34e"; }; - buildInputs = [ ecl-converters ecl-build ecl-sigslots ecl-mobile-robot ecl-command-line ecl-devices ecl-geometry ecl-time ]; - propagatedBuildInputs = [ ecl-converters ecl-sigslots ecl-mobile-robot ecl-command-line ecl-devices ecl-geometry ecl-time ]; + buildInputs = [ ecl-converters ecl-sigslots ecl-command-line ecl-mobile-robot ecl-geometry ecl-time ecl-build ecl-devices ]; + propagatedBuildInputs = [ ecl-converters ecl-sigslots ecl-command-line ecl-mobile-robot ecl-geometry ecl-time ecl-devices ]; nativeBuildInputs = [ catkin ]; meta = { description = ''C++ driver library for Kobuki: Pure C++ driver library for Kobuki. This is for those who do not wish to use ROS on their systems.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/kobuki-ftdi/default.nix b/melodic/kobuki-ftdi/default.nix index b36c80eee3..90e3cb1f44 100644 --- a/melodic/kobuki-ftdi/default.nix +++ b/melodic/kobuki-ftdi/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "e1c6ba8e7d1fbd11de09faca56c7dd845fb12aa44432909e2ae0df6867296828"; }; - buildInputs = [ libftdi ecl-command-line libusb pkg-config ]; + buildInputs = [ pkg-config ecl-command-line libftdi libusb ]; propagatedBuildInputs = [ libusb libftdi ecl-command-line ]; nativeBuildInputs = [ catkin ]; @@ -21,6 +21,6 @@ buildRosPackage { This package contains tools for flashing the Kobuki's FTDI chip (usually done at the factory). The special firmware for the FTDI chip (USB to serial converter) enables it to appear as /dev/kobuki on the user's PC.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/kobuki-msgs/default.nix b/melodic/kobuki-msgs/default.nix index 0473f68f21..58344c3983 100644 --- a/melodic/kobuki-msgs/default.nix +++ b/melodic/kobuki-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''

    Kobuki message and service types: custom messages and services for Kobuki packages.

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/laser-assembler/default.nix b/melodic/laser-assembler/default.nix index 4a7cc10cc1..18cb2dd48b 100644 --- a/melodic/laser-assembler/default.nix +++ b/melodic/laser-assembler/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "e9f578692846ccaf041da048fcfcef51d1a421a2869c94d2970541af319d3823"; }; - buildInputs = [ filters pluginlib tf sensor-msgs message-filters roscpp rostest message-generation laser-geometry ]; - propagatedBuildInputs = [ filters laser-geometry pluginlib message-runtime tf sensor-msgs roscpp message-filters ]; + buildInputs = [ filters pluginlib tf sensor-msgs message-filters rostest laser-geometry message-generation roscpp ]; + propagatedBuildInputs = [ filters pluginlib tf sensor-msgs message-filters laser-geometry message-runtime roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Provides nodes to assemble point clouds from either LaserScan or PointCloud messages''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/laser-cb-detector/default.nix b/melodic/laser-cb-detector/default.nix index 9e32171137..9f0a058141 100644 --- a/melodic/laser-cb-detector/default.nix +++ b/melodic/laser-cb-detector/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "84dfc40a2bed5cc329a50aba2e513550e8a8aa9de1b0d0719676e04ee3107d7e"; }; - buildInputs = [ roscpp settlerlib actionlib-msgs actionlib std-msgs cv-bridge message-filters image-cb-detector ]; - propagatedBuildInputs = [ roscpp settlerlib actionlib-msgs actionlib std-msgs cv-bridge message-filters image-cb-detector ]; + buildInputs = [ actionlib-msgs cv-bridge message-filters image-cb-detector settlerlib actionlib std-msgs roscpp ]; + propagatedBuildInputs = [ actionlib-msgs cv-bridge message-filters image-cb-detector settlerlib actionlib std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Extracts checkerboard corners from a dense laser snapshot. This package is experimental and unstable. Expect its APIs to change.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/laser-filtering/default.nix b/melodic/laser-filtering/default.nix index f910a1439a..0dd4890577 100644 --- a/melodic/laser-filtering/default.nix +++ b/melodic/laser-filtering/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''ROS Libraries for filtering specific kinds of laser scans''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/laser-filters-jsk-patch/default.nix b/melodic/laser-filters-jsk-patch/default.nix index 8e38f1287a..7830b6ea01 100644 --- a/melodic/laser-filters-jsk-patch/default.nix +++ b/melodic/laser-filters-jsk-patch/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "527127469522f807829b1ea468b5e060556a1b55e1023deff91c921171746dec"; }; - buildInputs = [ filters laser-filters cmake-modules mk git laser-geometry ]; + buildInputs = [ filters cmake-modules mk git laser-filters laser-geometry ]; propagatedBuildInputs = [ filters laser-filters ]; nativeBuildInputs = [ catkin ]; meta = { description = ''laser_filters_jsk_patch''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/laser-filters/default.nix b/melodic/laser-filters/default.nix index 7df2652984..d023e4ae90 100644 --- a/melodic/laser-filters/default.nix +++ b/melodic/laser-filters/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "7429472a08b080cae1e101e9e96443b884791926ad59479c553809669347d46e"; }; - buildInputs = [ filters pluginlib tf sensor-msgs message-filters roscpp rostest angles laser-geometry ]; - propagatedBuildInputs = [ filters laser-geometry pluginlib angles tf sensor-msgs roscpp message-filters ]; + buildInputs = [ filters pluginlib tf sensor-msgs message-filters rostest laser-geometry angles roscpp ]; + propagatedBuildInputs = [ filters pluginlib tf sensor-msgs message-filters laser-geometry angles roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Assorted filters designed to operate on 2D planar laser scanners, which use the sensor_msgs/LaserScan type.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/laser-geometry/default.nix b/melodic/laser-geometry/default.nix index 67af92c644..b29fdf1a55 100644 --- a/melodic/laser-geometry/default.nix +++ b/melodic/laser-geometry/default.nix @@ -12,9 +12,9 @@ buildRosPackage { sha256 = "d2c0acb926c14dd2000db4b395b3bbcc26b53fc76461f4cf7c262947e3ed9138"; }; - buildInputs = [ cmake-modules boost eigen angles sensor-msgs tf roscpp ]; + buildInputs = [ cmake-modules boost sensor-msgs roscpp eigen angles tf ]; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ pythonPackages.numpy boost eigen angles sensor-msgs tf roscpp ]; + propagatedBuildInputs = [ pythonPackages.numpy boost sensor-msgs roscpp eigen angles tf ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { sensor_msgs/LaserScan into a point cloud as defined by sensor_msgs/PointCloud or sensor_msgs/PointCloud2. In particular, it contains functionality to account for the skew resulting from moving robots or tilting laser scanners.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/laser-pipeline/default.nix b/melodic/laser-pipeline/default.nix index b9f6006a54..ad8e907af1 100644 --- a/melodic/laser-pipeline/default.nix +++ b/melodic/laser-pipeline/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Meta-package of libraries for processing laser data, including converting laser data into 3D representations.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/laser-proc/default.nix b/melodic/laser-proc/default.nix index 1be485f09b..15face2cb9 100644 --- a/melodic/laser-proc/default.nix +++ b/melodic/laser-proc/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''laser_proc''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/lauv-control/default.nix b/melodic/lauv-control/default.nix index 50b33279a8..b4e8f45339 100644 --- a/melodic/lauv-control/default.nix +++ b/melodic/lauv-control/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, uuv-trajectory-control, catkin, uuv-control-utils, uuv-teleop, lauv-description, uuv-auv-control-allocator }: +{ lib, buildRosPackage, fetchurl, uuv-trajectory-control, catkin, uuv-teleop, uuv-control-utils, lauv-description, uuv-auv-control-allocator }: buildRosPackage { pname = "ros-melodic-lauv-control"; version = "0.1.6"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "2a5dafaa1dbc26fc3c4d0b91fc39a6a9f822b8ed8c164e5001189c881cac011d"; }; - propagatedBuildInputs = [ uuv-control-utils lauv-description uuv-auv-control-allocator uuv-trajectory-control uuv-teleop ]; + propagatedBuildInputs = [ uuv-trajectory-control uuv-control-utils uuv-teleop lauv-description uuv-auv-control-allocator ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Collection of configuration and launch files to start controllers for the LAUV.''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/lauv-description/default.nix b/melodic/lauv-description/default.nix index 971b97eb4c..82e5b3e12b 100644 --- a/melodic/lauv-description/default.nix +++ b/melodic/lauv-description/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; checkInputs = [ rostest xacro rosunit ]; - propagatedBuildInputs = [ gazebo-ros uuv-assistants uuv-gazebo-ros-plugins uuv-sensor-ros-plugins robot-state-publisher uuv-descriptions xacro ]; + propagatedBuildInputs = [ gazebo-ros uuv-gazebo-ros-plugins uuv-sensor-ros-plugins uuv-assistants uuv-descriptions robot-state-publisher xacro ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Robot description files for the LAUV.''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/lauv-gazebo/default.nix b/melodic/lauv-gazebo/default.nix index 2c412048e4..a05278af2c 100644 --- a/melodic/lauv-gazebo/default.nix +++ b/melodic/lauv-gazebo/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Sample launch files to start a simulated LAUV in Gazebo.''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/leg-detector/default.nix b/melodic/leg-detector/default.nix index e6f8b5d8e4..75d15a2661 100644 --- a/melodic/leg-detector/default.nix +++ b/melodic/leg-detector/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, std-srvs, map-laser, people-tracking-filter, people-msgs, sensor-msgs, catkin, message-filters, roscpp, image-geometry, laser-geometry, laser-filters, visualization-msgs, bfl, std-msgs, dynamic-reconfigure, tf, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, std-srvs, map-laser, people-tracking-filter, people-msgs, tf, sensor-msgs, catkin, message-filters, image-geometry, laser-geometry, laser-filters, visualization-msgs, bfl, std-msgs, dynamic-reconfigure, roscpp, geometry-msgs }: buildRosPackage { pname = "ros-melodic-leg-detector"; version = "1.1.2"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "e1865c4b5c768ff408d3d1cb531bf26dd6acac28f2a7ad5d25fe11cf6ed85bb8"; }; - buildInputs = [ std-srvs people-msgs tf sensor-msgs bfl message-filters roscpp image-geometry laser-geometry visualization-msgs dynamic-reconfigure std-msgs people-tracking-filter geometry-msgs ]; - propagatedBuildInputs = [ std-srvs map-laser people-tracking-filter people-msgs tf sensor-msgs bfl message-filters roscpp image-geometry laser-geometry laser-filters dynamic-reconfigure std-msgs visualization-msgs geometry-msgs ]; + buildInputs = [ std-srvs people-tracking-filter people-msgs sensor-msgs bfl message-filters roscpp image-geometry laser-geometry visualization-msgs dynamic-reconfigure std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ std-srvs map-laser people-tracking-filter people-msgs sensor-msgs bfl message-filters roscpp image-geometry laser-geometry laser-filters visualization-msgs dynamic-reconfigure std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Leg Detector using a machine learning approach to find leg-like patterns of laser scanner readings.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/lex-common-msgs/default.nix b/melodic/lex-common-msgs/default.nix index 3e92f610da..f127b71832 100644 --- a/melodic/lex-common-msgs/default.nix +++ b/melodic/lex-common-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Common messages for interacting with Amazon Lex using the lex_node package''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/lex-node/default.nix b/melodic/lex-node/default.nix index b52aeb0964..4482cb7952 100644 --- a/melodic/lex-node/default.nix +++ b/melodic/lex-node/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Package providing a ROS node for interacting with Amazon Lex''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/lgsvl-msgs/default.nix b/melodic/lgsvl-msgs/default.nix index 14624984d2..01c614f99c 100644 --- a/melodic/lgsvl-msgs/default.nix +++ b/melodic/lgsvl-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The lgsvl_msgs package for ground truth data.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/libcmt/default.nix b/melodic/libcmt/default.nix index 4713570039..167ebdd1f9 100644 --- a/melodic/libcmt/default.nix +++ b/melodic/libcmt/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''libCMT ROS Wrapper''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/libg2o/default.nix b/melodic/libg2o/default.nix index ed0c826c76..67c5445c75 100644 --- a/melodic/libg2o/default.nix +++ b/melodic/libg2o/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ suitesparse boost eigen libGLU libGL ]; - propagatedBuildInputs = [ libGL suitesparse boost eigen libGLU catkin ]; + propagatedBuildInputs = [ suitesparse boost catkin eigen libGLU libGL ]; nativeBuildInputs = [ cmake ]; meta = { description = ''The libg2o library from http://openslam.org/g2o.html''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/libmavconn/default.nix b/melodic/libmavconn/default.nix index 5a95eeb99b..4d2d5d2219 100644 --- a/melodic/libmavconn/default.nix +++ b/melodic/libmavconn/default.nix @@ -23,6 +23,6 @@ buildRosPackage { and URL to connection object mapper. This library can be used in standalone programs.''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; }; } diff --git a/melodic/libmodbus/default.nix b/melodic/libmodbus/default.nix index 947ef1c23a..4a17200e77 100644 --- a/melodic/libmodbus/default.nix +++ b/melodic/libmodbus/default.nix @@ -22,6 +22,6 @@ buildRosPackage { 2) Moving Mean 3) Gravity Compensation (used for force-torque sensors) 4) Threshold Filter''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/libphidget21/default.nix b/melodic/libphidget21/default.nix index 3de06919d3..7cc19b314e 100644 --- a/melodic/libphidget21/default.nix +++ b/melodic/libphidget21/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package wraps the libphidget21 to use it as a ROS dependency''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/libqt-concurrent/default.nix b/melodic/libqt-concurrent/default.nix index fe111b2892..0652b519a3 100644 --- a/melodic/libqt-concurrent/default.nix +++ b/melodic/libqt-concurrent/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''libqt-concurrent metapackage supporting qt4 and qt5''; - #license = lib.licenses.United States Government Purpose; + license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; }; } diff --git a/melodic/libqt-core/default.nix b/melodic/libqt-core/default.nix index 583d7f721f..f90e6fab3d 100644 --- a/melodic/libqt-core/default.nix +++ b/melodic/libqt-core/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''libqt-core metapackage supporting qt4 and qt5''; - #license = lib.licenses.United States Government Purpose; + license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; }; } diff --git a/melodic/libqt-dev/default.nix b/melodic/libqt-dev/default.nix index 2cfc5b48ba..bb26d47c08 100644 --- a/melodic/libqt-dev/default.nix +++ b/melodic/libqt-dev/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''libqt-dev metapackage supporting qt4 and qt5''; - #license = lib.licenses.United States Government Purpose; + license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; }; } diff --git a/melodic/libqt-gui/default.nix b/melodic/libqt-gui/default.nix index 4b388f36a2..b1088556b1 100644 --- a/melodic/libqt-gui/default.nix +++ b/melodic/libqt-gui/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''libqt-gui metapackage supporting qt4 and qt5''; - #license = lib.licenses.United States Government Purpose; + license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; }; } diff --git a/melodic/libqt-network/default.nix b/melodic/libqt-network/default.nix index 67d7dafa29..4f8bbd8d54 100644 --- a/melodic/libqt-network/default.nix +++ b/melodic/libqt-network/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''libqt-network metapackage supporting qt4 and qt5''; - #license = lib.licenses.United States Government Purpose; + license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; }; } diff --git a/melodic/libqt-opengl-dev/default.nix b/melodic/libqt-opengl-dev/default.nix index ccea31030f..446d890942 100644 --- a/melodic/libqt-opengl-dev/default.nix +++ b/melodic/libqt-opengl-dev/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''libqt-opengl metapackage supporting qt4 and qt5''; - #license = lib.licenses.United States Government Purpose; + license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; }; } diff --git a/melodic/libqt-opengl/default.nix b/melodic/libqt-opengl/default.nix index b18dab8db2..011745d934 100644 --- a/melodic/libqt-opengl/default.nix +++ b/melodic/libqt-opengl/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''libqt-opengl metapackage supporting qt4 and qt5''; - #license = lib.licenses.United States Government Purpose; + license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; }; } diff --git a/melodic/libqt-svg-dev/default.nix b/melodic/libqt-svg-dev/default.nix index 88afdd79e8..77d3cc90d8 100644 --- a/melodic/libqt-svg-dev/default.nix +++ b/melodic/libqt-svg-dev/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''libqt-svg-dev metapackage supporting qt4 and qt5''; - #license = lib.licenses.United States Government Purpose; + license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; }; } diff --git a/melodic/libqt-widgets/default.nix b/melodic/libqt-widgets/default.nix index 5be5401940..475ab460a3 100644 --- a/melodic/libqt-widgets/default.nix +++ b/melodic/libqt-widgets/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''libqt-widgets metapackage supporting qt4 and qt5''; - #license = lib.licenses.United States Government Purpose; + license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; }; } diff --git a/melodic/libreflexxestype2/default.nix b/melodic/libreflexxestype2/default.nix index 5c705453dc..f4531dce7c 100644 --- a/melodic/libreflexxestype2/default.nix +++ b/melodic/libreflexxestype2/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''Package with ReflexxesTypeII implementation and header files''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/librviz-tutorial/default.nix b/melodic/librviz-tutorial/default.nix index 3da88952c1..9f6bb3cef1 100644 --- a/melodic/librviz-tutorial/default.nix +++ b/melodic/librviz-tutorial/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Tutorial showing how to compile your own C++ program with RViz displays and features.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/libsiftfast/default.nix b/melodic/libsiftfast/default.nix index 44ef2077c9..ba534b5991 100644 --- a/melodic/libsiftfast/default.nix +++ b/melodic/libsiftfast/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "ca3a75a0f18b137f41486124251c3fc8319bbe4b7b6b959662f46067dffe6457"; }; - buildInputs = [ rospack pythonPackages.numpy rosboost-cfg boost mk roslib subversion ]; + buildInputs = [ pythonPackages.numpy rospack rosboost-cfg boost mk subversion roslib ]; propagatedBuildInputs = [ pythonPackages.numpy boost ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Library to compute SIFT features''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/libuvc-camera/default.nix b/melodic/libuvc-camera/default.nix index 8d478095ff..7c8ad9dc54 100644 --- a/melodic/libuvc-camera/default.nix +++ b/melodic/libuvc-camera/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "2ea19c5821e70fe6c63da750b35c6ae0dfff43faadca9f951c0137e5701834b0"; }; - buildInputs = [ dynamic-reconfigure camera-info-manager image-transport sensor-msgs nodelet libuvc roscpp ]; - propagatedBuildInputs = [ dynamic-reconfigure camera-info-manager image-transport sensor-msgs nodelet libuvc roscpp ]; + buildInputs = [ camera-info-manager image-transport sensor-msgs roscpp dynamic-reconfigure nodelet libuvc ]; + propagatedBuildInputs = [ camera-info-manager image-transport sensor-msgs roscpp dynamic-reconfigure nodelet libuvc ]; nativeBuildInputs = [ catkin ]; meta = { description = ''USB Video Class camera driver''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/libuvc-ros/default.nix b/melodic/libuvc-ros/default.nix index 978fbdd06f..871f37d7b9 100644 --- a/melodic/libuvc-ros/default.nix +++ b/melodic/libuvc-ros/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''libuvc_ros metapackage''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/libuvc/default.nix b/melodic/libuvc/default.nix index faef85b1ec..5e365d9e25 100644 --- a/melodic/libuvc/default.nix +++ b/melodic/libuvc/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''USB Video Class driver library''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/linksys-access-point/default.nix b/melodic/linksys-access-point/default.nix index 7095b8161e..031a2dfd2f 100644 --- a/melodic/linksys-access-point/default.nix +++ b/melodic/linksys-access-point/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''A ROS node that controls a Linksys access point with a Linksys WRT610n-compatible web interface.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/linux-networking/default.nix b/melodic/linux-networking/default.nix index 7bc4d14f12..63ee0dcbb7 100644 --- a/melodic/linux-networking/default.nix +++ b/melodic/linux-networking/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "a8cdf75617afe3c16004467e3866a5de070a7e6ac7e5a4835be27f2a034e27a6"; }; - propagatedBuildInputs = [ access-point-control hostapd-access-point multi-interface-roam ieee80211-channels network-control-tests network-monitor-udp asmach-tutorials linksys-access-point network-traffic-control network-detector asmach ddwrt-access-point ]; + propagatedBuildInputs = [ access-point-control hostapd-access-point network-control-tests ieee80211-channels multi-interface-roam network-monitor-udp asmach-tutorials linksys-access-point network-traffic-control network-detector asmach ddwrt-access-point ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The linux_networking package''; - #license = lib.licenses.TODO; + license = with lib.licenses; [ "TODO" ]; }; } diff --git a/melodic/lockfree/default.nix b/melodic/lockfree/default.nix index 6317a15e2f..0f686648d2 100644 --- a/melodic/lockfree/default.nix +++ b/melodic/lockfree/default.nix @@ -21,6 +21,6 @@ buildRosPackage { kinds of data structures are generally not as easy to use as single-threaded equivalents, and are not always faster. If you don't know you need to use one, try another structure with a lock around it first.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/locomotor-msgs/default.nix b/melodic/locomotor-msgs/default.nix index 3224d3c075..ce4059cd2f 100644 --- a/melodic/locomotor-msgs/default.nix +++ b/melodic/locomotor-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Action definition for Locomotor''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/locomotor/default.nix b/melodic/locomotor/default.nix index d6609a052c..4635795bf4 100644 --- a/melodic/locomotor/default.nix +++ b/melodic/locomotor/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Locomotor is an extensible path planning coordination engine that replaces move_base. The goal is to provide a mechanism for controlling what happens when the global and local planners succeed and fail. It leverages ROS callback queues to coordinate multiple threads.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/locomove-base/default.nix b/melodic/locomove-base/default.nix index 5e99f472a3..925d9b67b4 100644 --- a/melodic/locomove-base/default.nix +++ b/melodic/locomove-base/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "f8eb11d52a5e4b23ba8563021f1273b28f5be9f690335ab490ae50ca34f23b30"; }; - buildInputs = [ move-base-msgs nav-2d-utils nav-core-adapter locomotor nav-core ]; + buildInputs = [ nav-core-adapter nav-core move-base-msgs nav-2d-utils locomotor ]; checkInputs = [ roslint ]; - propagatedBuildInputs = [ move-base-msgs nav-2d-utils nav-core-adapter locomotor nav-core ]; + propagatedBuildInputs = [ nav-core-adapter nav-core move-base-msgs nav-2d-utils locomotor ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Extension of locomotor that implements move_base's functionality.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/lpg-planner/default.nix b/melodic/lpg-planner/default.nix index d732b57000..8dcc944927 100644 --- a/melodic/lpg-planner/default.nix +++ b/melodic/lpg-planner/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''lpg_planner: LPGL Planner (http://zeus.ing.unibs.it/lpg/)''; - #license = lib.licenses.GPL; + license = with lib.licenses; [ gpl1 ]; }; } diff --git a/melodic/lusb/default.nix b/melodic/lusb/default.nix index d7c288e3ba..f60f94fb68 100644 --- a/melodic/lusb/default.nix +++ b/melodic/lusb/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Library for interfacing to USB devices''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/map-laser/default.nix b/melodic/map-laser/default.nix index 070c8e87e1..1e41bac257 100644 --- a/melodic/map-laser/default.nix +++ b/melodic/map-laser/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "eea82c4a217ce37a62d9e6dc06c0a309cbe738b5da63ea573aea59d8efa25d67"; }; - buildInputs = [ nav-msgs rospy std-msgs sensor-msgs tf ]; - propagatedBuildInputs = [ laser-filters nav-msgs rospy std-msgs sensor-msgs roslib tf ]; + buildInputs = [ sensor-msgs nav-msgs rospy std-msgs tf ]; + propagatedBuildInputs = [ tf sensor-msgs laser-filters nav-msgs rospy std-msgs roslib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Filters a laser scan to remove points that are in the current static map''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/map-merge-3d/default.nix b/melodic/map-merge-3d/default.nix index c1440dc7ea..898b86f837 100644 --- a/melodic/map-merge-3d/default.nix +++ b/melodic/map-merge-3d/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Merging multiple 3D maps, represented as pointclouds, without knowledge of initial positions of robots.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/map-msgs/default.nix b/melodic/map-msgs/default.nix index 4e367d9c85..480baf26a2 100644 --- a/melodic/map-msgs/default.nix +++ b/melodic/map-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package defines messages commonly used in mapping packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/map-organizer-msgs/default.nix b/melodic/map-organizer-msgs/default.nix index 3587d228a9..f958efd5cd 100644 --- a/melodic/map-organizer-msgs/default.nix +++ b/melodic/map-organizer-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message definitions for map_organizer_msgs package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/map-server/default.nix b/melodic/map-server/default.nix index 46c866973f..a5805f0101 100644 --- a/melodic/map-server/default.nix +++ b/melodic/map-server/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "bfa8523b9c697f97956d24e89857dcccc5b4cc09844b42adb0ce066c6df28972"; }; - buildInputs = [ tf2 nav-msgs bullet SDL_image SDL libyamlcpp roscpp ]; + buildInputs = [ SDL bullet SDL_image libyamlcpp tf2 nav-msgs roscpp ]; checkInputs = [ rostest rosunit rospy ]; - propagatedBuildInputs = [ tf2 nav-msgs bullet SDL_image SDL libyamlcpp roscpp ]; + propagatedBuildInputs = [ SDL bullet SDL_image libyamlcpp tf2 nav-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''map_server provides the map_server ROS Node, which offers map data as a ROS Service. It also provides the map_saver command-line utility, which allows dynamically generated maps to be saved to file.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mapviz-plugins/default.nix b/melodic/mapviz-plugins/default.nix index cd69398c82..c071e36ff3 100644 --- a/melodic/mapviz-plugins/default.nix +++ b/melodic/mapviz-plugins/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, cv-bridge, swri-route-util, swri-yaml-util, actionlib, tf, swri-transform-util, stereo-msgs, marti-visualization-msgs, image-transport, gps-common, libqt-dev, libqt-opengl, swri-math-util, mapviz, catkin, move-base-msgs, nav-msgs, qt-qmake, std-msgs, roscpp, visualization-msgs, pluginlib, sensor-msgs, libqt-core, marti-nav-msgs, marti-common-msgs, libqt-opengl-dev, swri-image-util, map-msgs }: +{ lib, buildRosPackage, fetchurl, cv-bridge, swri-route-util, swri-yaml-util, actionlib, tf, stereo-msgs, swri-transform-util, marti-visualization-msgs, image-transport, gps-common, libqt-dev, libqt-opengl, swri-math-util, mapviz, catkin, move-base-msgs, nav-msgs, qt-qmake, std-msgs, roscpp, visualization-msgs, pluginlib, sensor-msgs, libqt-core, marti-nav-msgs, marti-common-msgs, libqt-opengl-dev, swri-image-util, map-msgs }: buildRosPackage { pname = "ros-melodic-mapviz-plugins"; version = "1.1.0"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "be044acba9267e5b7039c30a67b9acdf824e5c326a28fb1faa6a770646c9cb7e"; }; - buildInputs = [ swri-math-util mapviz cv-bridge swri-route-util move-base-msgs nav-msgs swri-yaml-util actionlib std-msgs tf roscpp visualization-msgs stereo-msgs swri-transform-util pluginlib marti-visualization-msgs image-transport sensor-msgs marti-nav-msgs gps-common marti-common-msgs libqt-dev libqt-opengl-dev swri-image-util map-msgs ]; - propagatedBuildInputs = [ swri-math-util mapviz cv-bridge swri-route-util move-base-msgs nav-msgs swri-yaml-util actionlib std-msgs tf roscpp visualization-msgs stereo-msgs swri-transform-util pluginlib marti-visualization-msgs image-transport sensor-msgs libqt-core marti-nav-msgs gps-common marti-common-msgs libqt-opengl swri-image-util map-msgs ]; + buildInputs = [ cv-bridge swri-route-util swri-yaml-util actionlib tf swri-transform-util stereo-msgs marti-visualization-msgs image-transport gps-common libqt-dev swri-math-util mapviz move-base-msgs nav-msgs std-msgs roscpp visualization-msgs pluginlib sensor-msgs marti-nav-msgs marti-common-msgs libqt-opengl-dev swri-image-util map-msgs ]; + propagatedBuildInputs = [ cv-bridge swri-route-util swri-yaml-util actionlib tf swri-transform-util stereo-msgs marti-visualization-msgs image-transport gps-common libqt-opengl swri-math-util mapviz move-base-msgs nav-msgs std-msgs roscpp visualization-msgs pluginlib sensor-msgs libqt-core marti-nav-msgs marti-common-msgs swri-image-util map-msgs ]; nativeBuildInputs = [ catkin qt-qmake ]; meta = { description = ''Common plugins for the Mapviz visualization tool''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mapviz/default.nix b/melodic/mapviz/default.nix index 1a44f73c29..6207ce9e79 100644 --- a/melodic/mapviz/default.nix +++ b/melodic/mapviz/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "f616f580f6f6712bc46043efb0a4fc6131a412504c23519d17074846c43cab8d"; }; - buildInputs = [ std-srvs rosapi rqt-gui cv-bridge xorg.libXi freeglut rqt-gui-cpp swri-yaml-util roscpp tf xorg.libXmu swri-transform-util pluginlib image-transport message-generation marti-common-msgs libqt-dev libqt-opengl-dev glew ]; - propagatedBuildInputs = [ std-srvs rosapi rqt-gui cv-bridge xorg.libXi freeglut rqt-gui-cpp swri-yaml-util roscpp tf xorg.libXmu swri-transform-util pluginlib image-transport libqt-core libqt-opengl marti-common-msgs message-runtime glew ]; + buildInputs = [ rqt-gui cv-bridge xorg.libXi freeglut swri-yaml-util tf xorg.libXmu swri-transform-util image-transport message-generation libqt-dev std-srvs rosapi rqt-gui-cpp roscpp pluginlib marti-common-msgs libqt-opengl-dev glew ]; + propagatedBuildInputs = [ rqt-gui cv-bridge xorg.libXi freeglut swri-yaml-util tf xorg.libXmu swri-transform-util image-transport message-runtime libqt-opengl std-srvs rosapi rqt-gui-cpp roscpp pluginlib libqt-core marti-common-msgs glew ]; nativeBuildInputs = [ catkin qt-qmake pkg-config ]; meta = { description = ''mapviz''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/marker-msgs/default.nix b/melodic/marker-msgs/default.nix index 95eec483d8..508d571ff5 100644 --- a/melodic/marker-msgs/default.nix +++ b/melodic/marker-msgs/default.nix @@ -21,6 +21,6 @@ buildRosPackage { The package distinguishes between two types of messages. First messages to describe the properties of a marker/fiducial detection system and the detected markers. Secondly messages used to represent a map of markers/features with covariances as it would be produced by a SLAM system or published by a map server for self-localization.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/marti-can-msgs/default.nix b/melodic/marti-can-msgs/default.nix index 3cc3899ae6..9ee94ec1b4 100644 --- a/melodic/marti-can-msgs/default.nix +++ b/melodic/marti-can-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''marti_can_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/marti-common-msgs/default.nix b/melodic/marti-common-msgs/default.nix index bfc1bb58f9..0e3d45e9b4 100644 --- a/melodic/marti-common-msgs/default.nix +++ b/melodic/marti-common-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''marti_common_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/marti-data-structures/default.nix b/melodic/marti-data-structures/default.nix index 8381c68a2f..cef905a23b 100644 --- a/melodic/marti-data-structures/default.nix +++ b/melodic/marti-data-structures/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''marti_data_structures''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/marti-nav-msgs/default.nix b/melodic/marti-nav-msgs/default.nix index 524730f324..5355db031f 100644 --- a/melodic/marti-nav-msgs/default.nix +++ b/melodic/marti-nav-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "d4e787cb1a9e173eda0759738129af2ec90c286bcc3dcc35b4d622198ed2b917"; }; - buildInputs = [ geographic-msgs message-generation marti-common-msgs std-msgs sensor-msgs geometry-msgs ]; - propagatedBuildInputs = [ geographic-msgs marti-common-msgs message-runtime std-msgs sensor-msgs geometry-msgs ]; + buildInputs = [ sensor-msgs geographic-msgs message-generation marti-common-msgs std-msgs geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs geographic-msgs marti-common-msgs message-runtime std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''marti_nav_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/marti-perception-msgs/default.nix b/melodic/marti-perception-msgs/default.nix index 2d7bf23a98..e036682a26 100644 --- a/melodic/marti-perception-msgs/default.nix +++ b/melodic/marti-perception-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''marti_perception_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/marti-sensor-msgs/default.nix b/melodic/marti-sensor-msgs/default.nix index bc84bd6008..4ce11cb9f3 100644 --- a/melodic/marti-sensor-msgs/default.nix +++ b/melodic/marti-sensor-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''marti_sensor_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/marti-status-msgs/default.nix b/melodic/marti-status-msgs/default.nix index d0a75d59ea..be86856823 100644 --- a/melodic/marti-status-msgs/default.nix +++ b/melodic/marti-status-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''marti_status_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/marti-visualization-msgs/default.nix b/melodic/marti-visualization-msgs/default.nix index a751bdedc2..0ce1514ac6 100644 --- a/melodic/marti-visualization-msgs/default.nix +++ b/melodic/marti-visualization-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''marti_visualization_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/master-discovery-fkie/default.nix b/melodic/master-discovery-fkie/default.nix index 14a0dd7ab7..4f04f60d47 100644 --- a/melodic/master-discovery-fkie/default.nix +++ b/melodic/master-discovery-fkie/default.nix @@ -5,15 +5,15 @@ { lib, buildRosPackage, fetchurl, std-srvs, catkin, pythonPackages, multimaster-msgs-fkie, rosgraph, rospy, roslib, avahi }: buildRosPackage { pname = "ros-melodic-master-discovery-fkie"; - version = "0.8.10"; + version = "0.8.12"; src = fetchurl { - url = https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/master_discovery_fkie/0.8.10-0.tar.gz; - sha256 = "bed1b9628b65746572e5ad687ae614f1a1011fed933da0700a673e7ab1146c0a"; + url = https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/master_discovery_fkie/0.8.12-0.tar.gz; + sha256 = "a126c9f12ac3c9b370068d862b423f8476fa0d81b31e8474195049ab2ec28918"; }; buildInputs = [ std-srvs multimaster-msgs-fkie ]; - propagatedBuildInputs = [ roslib std-srvs rosgraph rospy multimaster-msgs-fkie pythonPackages.avahi avahi ]; + propagatedBuildInputs = [ std-srvs multimaster-msgs-fkie pythonPackages.avahi rosgraph rospy roslib avahi ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { multicast group. The alternative is to use a zeroconf/avahi daemon to register the ROS master as service and discover other ROS masters.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/master-sync-fkie/default.nix b/melodic/master-sync-fkie/default.nix index a4583f4a2b..ec857dbb17 100644 --- a/melodic/master-sync-fkie/default.nix +++ b/melodic/master-sync-fkie/default.nix @@ -5,21 +5,21 @@ { lib, buildRosPackage, fetchurl, catkin, multimaster-msgs-fkie, rosgraph, rospy, master-discovery-fkie, roslib }: buildRosPackage { pname = "ros-melodic-master-sync-fkie"; - version = "0.8.10"; + version = "0.8.12"; src = fetchurl { - url = https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/master_sync_fkie/0.8.10-0.tar.gz; - sha256 = "4b3b2e87577c4ef67a8e479f9c71dd2352320e3559fa054cff279e245418299c"; + url = https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/master_sync_fkie/0.8.12-0.tar.gz; + sha256 = "14b81d9024f42cd1ad4eb7e35af79cdddc3682c38bbc867fea109156368b4814"; }; buildInputs = [ master-discovery-fkie multimaster-msgs-fkie ]; - propagatedBuildInputs = [ roslib rosgraph rospy master-discovery-fkie multimaster-msgs-fkie ]; + propagatedBuildInputs = [ multimaster-msgs-fkie rosgraph rospy master-discovery-fkie roslib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Synchronize the local ROS master to the remote masters discovered by master_discovery_fkie node. The registration of topics and services is only perform by local ROS master.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mav-comm/default.nix b/melodic/mav-comm/default.nix index 39e357fcb6..ac3f349694 100644 --- a/melodic/mav-comm/default.nix +++ b/melodic/mav-comm/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Contains messages and services for MAV communication''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/mav-msgs/default.nix b/melodic/mav-msgs/default.nix index 6b83f017e2..f250b98fe2 100644 --- a/melodic/mav-msgs/default.nix +++ b/melodic/mav-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "32087bfaf586c5c054af80c396360bbe6997998cec9f6ac44233020ce9ca4c43"; }; - buildInputs = [ message-generation cmake-modules eigen std-msgs trajectory-msgs geometry-msgs ]; - propagatedBuildInputs = [ message-runtime eigen std-msgs trajectory-msgs geometry-msgs ]; + buildInputs = [ cmake-modules trajectory-msgs message-generation eigen std-msgs geometry-msgs ]; + propagatedBuildInputs = [ trajectory-msgs message-runtime eigen std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Package containing messages for communicating with rotary wing MAVs''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/mav-planning-msgs/default.nix b/melodic/mav-planning-msgs/default.nix index 9bd51b3e82..3380199b44 100644 --- a/melodic/mav-planning-msgs/default.nix +++ b/melodic/mav-planning-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages specific to MAV planning, especially polynomial planning.''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/mavlink/default.nix b/melodic/mavlink/default.nix index f8403a2cfe..bb360d42b5 100644 --- a/melodic/mavlink/default.nix +++ b/melodic/mavlink/default.nix @@ -22,6 +22,6 @@ buildRosPackage { for both 1.0 and 2.0 versions of protocol. For pymavlink use separate install via rosdep (python-pymavlink).''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/mavros-extras/default.nix b/melodic/mavros-extras/default.nix index bebbc1966a..9a39aa025c 100644 --- a/melodic/mavros-extras/default.nix +++ b/melodic/mavros-extras/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ cmake-modules sensor-msgs mavros roscpp urdf tf2-eigen visualization-msgs std-msgs tf mavros-msgs geometry-msgs ]; - propagatedBuildInputs = [ tf sensor-msgs mavros roscpp urdf tf2-eigen std-msgs visualization-msgs mavros-msgs geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs mavros roscpp urdf tf2-eigen visualization-msgs std-msgs tf mavros-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Extra nodes and plugins for MAVROS.''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; }; } diff --git a/melodic/mavros-msgs/default.nix b/melodic/mavros-msgs/default.nix index b3f9103d3e..713f313914 100644 --- a/melodic/mavros-msgs/default.nix +++ b/melodic/mavros-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "80cdf9f83bf0b611e8b08201b461ca0b73909bc211c66176e64a13ee9e0143ab"; }; - buildInputs = [ geographic-msgs message-generation std-msgs sensor-msgs geometry-msgs ]; - propagatedBuildInputs = [ geographic-msgs message-runtime std-msgs sensor-msgs geometry-msgs ]; + buildInputs = [ sensor-msgs geographic-msgs message-generation std-msgs geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs geographic-msgs message-runtime std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''mavros_msgs defines messages for MAVROS.''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; }; } diff --git a/melodic/mbf-abstract-core/default.nix b/melodic/mbf-abstract-core/default.nix index 6caaef5bdf..1398a2aea5 100644 --- a/melodic/mbf-abstract-core/default.nix +++ b/melodic/mbf-abstract-core/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package provides common interfaces for navigation specific robot actions. It contains the AbstractPlanner, AbstractController and AbstractRecovery plugin interfaces. This interfaces have to be implemented by the plugins to make the plugin available for Move Base Flex. The abstract classes provides a meaningful interface enabling the planners, controllers and recovery behaviors to return information, e.g. why something went wrong. Derivided interfaces can, for example, provide methods to initialize the planner, controller or recovery with map representations like costmap_2d, grid_map or other representations.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mbf-abstract-nav/default.nix b/melodic/mbf-abstract-nav/default.nix index ca1346f163..9866b15398 100644 --- a/melodic/mbf-abstract-nav/default.nix +++ b/melodic/mbf-abstract-nav/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "10abefaac5fac575dce38f004b4c92047014cfc577578d990cca8a1783fb91bb"; }; - buildInputs = [ std-srvs mbf-abstract-core actionlib-msgs tf mbf-msgs nav-msgs std-msgs actionlib xmlrpcpp dynamic-reconfigure mbf-utility roscpp geometry-msgs ]; - propagatedBuildInputs = [ std-srvs mbf-abstract-core actionlib-msgs tf mbf-msgs nav-msgs std-msgs actionlib xmlrpcpp dynamic-reconfigure mbf-utility roscpp geometry-msgs ]; + buildInputs = [ std-srvs mbf-abstract-core actionlib-msgs tf mbf-msgs mbf-utility nav-msgs actionlib xmlrpcpp dynamic-reconfigure std-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ std-srvs mbf-abstract-core actionlib-msgs tf mbf-msgs mbf-utility nav-msgs actionlib xmlrpcpp dynamic-reconfigure std-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The mbf_abstract_nav package contains the abstract navigation server implementation of Move Base Flex (MBF). The abstract navigation server is not bound to any map representation. It provides the actions for planning, controlling and recovering. MBF loads all defined plugins at the program start. Therefor, it loads all plugins which are defined in the lists *planners*, *controllers* and *recovery_behaviors*. Each list holds a pair of a *name* and a *type*. The *type* defines which kind of plugin to load. The *name* defines under which name the plugin should be callable by the actions.''; - #license = lib.licenses.3-Clause BSD; + license = with lib.licenses; [ "3-Clause BSD" ]; }; } diff --git a/melodic/mbf-costmap-core/default.nix b/melodic/mbf-costmap-core/default.nix index bbbbd22c36..4fda54a9ba 100644 --- a/melodic/mbf-costmap-core/default.nix +++ b/melodic/mbf-costmap-core/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, costmap-2d, mbf-abstract-core, nav-core, catkin, mbf-utility, std-msgs, tf, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, costmap-2d, mbf-abstract-core, nav-core, catkin, std-msgs, mbf-utility, tf, geometry-msgs }: buildRosPackage { pname = "ros-melodic-mbf-costmap-core"; version = "0.2.3"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "99c4b3f406d65d71f039477cd8f153e4514c064ef30fcba5e10e582cc3b15d66"; }; - buildInputs = [ mbf-utility costmap-2d mbf-abstract-core std-msgs nav-core tf geometry-msgs ]; - propagatedBuildInputs = [ mbf-utility costmap-2d mbf-abstract-core std-msgs nav-core tf geometry-msgs ]; + buildInputs = [ costmap-2d mbf-abstract-core nav-core mbf-utility std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ costmap-2d mbf-abstract-core nav-core mbf-utility std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package provides common interfaces for navigation specific robot actions. It contains the CostmapPlanner, CostmapController and CostmapRecovery interfaces. The interfaces have to be implemented by the plugins to make them available for Move Base Flex using the mbf_costmap_nav navigation implementation. That implementation inherits the mbf_abstract_nav implementation and binds the system to a local and a global costmap.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mbf-costmap-nav/default.nix b/melodic/mbf-costmap-nav/default.nix index de5339692a..eeec57c05b 100644 --- a/melodic/mbf-costmap-nav/default.nix +++ b/melodic/mbf-costmap-nav/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "90930d3e6a71b902aa8171c57d1d967a9d2fb131770d854494b932339bcad2cc"; }; - buildInputs = [ std-srvs mbf-costmap-core pluginlib actionlib-msgs base-local-planner tf mbf-msgs nav-core nav-msgs std-msgs actionlib dynamic-reconfigure mbf-utility roscpp mbf-abstract-nav geometry-msgs ]; - propagatedBuildInputs = [ std-srvs mbf-costmap-core pluginlib actionlib-msgs base-local-planner tf mbf-msgs nav-core move-base move-base-msgs nav-msgs std-msgs actionlib dynamic-reconfigure mbf-utility roscpp mbf-abstract-nav geometry-msgs ]; + buildInputs = [ std-srvs mbf-costmap-core pluginlib actionlib-msgs base-local-planner tf mbf-msgs nav-core mbf-utility nav-msgs actionlib dynamic-reconfigure std-msgs roscpp mbf-abstract-nav geometry-msgs ]; + propagatedBuildInputs = [ std-srvs mbf-costmap-core pluginlib actionlib-msgs base-local-planner tf mbf-msgs nav-core move-base mbf-utility move-base-msgs nav-msgs actionlib dynamic-reconfigure std-msgs roscpp mbf-abstract-nav geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The mbf_costmap_nav package contains the costmap navigation server implementation of Move Base Flex (MBF). The costmap navigation server is bound to the costmap_2d representation. It provides the Actions for planning, controlling and recovering. At the time of start MBF loads all defined plugins. Therefor, it loads all plugins which are defined in the lists *planners*, *controllers* and *recovery_behaviors*. Each list holds a pair of a *name* and a *type*. The *type* defines which kind of plugin to load. The *name* defines under which name the plugin should be callable by the actions. Additionally the mbf_costmap_nav package comes with a wrapper for the old navigation stack and the plugins which inherits from the nav_core base classes. Preferably it tries to load plugins for the new API. However, plugins could even support both move_base and move_base_flex by inheriting both base class interfaces located in the nav_core package and in the mbf_costmap_core package.''; - #license = lib.licenses.3-Clause BSD; + license = with lib.licenses; [ "3-Clause BSD" ]; }; } diff --git a/melodic/mbf-msgs/default.nix b/melodic/mbf-msgs/default.nix index 54882d4634..a1216b6e97 100644 --- a/melodic/mbf-msgs/default.nix +++ b/melodic/mbf-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "9ce647ffa0b672e1cda95157baf45218b9000882e3cad50dd384c5c59a5504da"; }; - buildInputs = [ nav-msgs message-generation message-runtime actionlib-msgs std-msgs genmsg geometry-msgs ]; - propagatedBuildInputs = [ nav-msgs message-runtime actionlib-msgs std-msgs geometry-msgs ]; + buildInputs = [ actionlib-msgs nav-msgs message-generation message-runtime std-msgs genmsg geometry-msgs ]; + propagatedBuildInputs = [ actionlib-msgs nav-msgs message-runtime std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The move_base_flex messages package providing the action definition files for the action GetPath, ExePath, Recovery and MoveBase. The action servers providing these action are implemented in mbf_abstract_nav.''; - #license = lib.licenses.3-Clause BSD; + license = with lib.licenses; [ "3-Clause BSD" ]; }; } diff --git a/melodic/mbf-simple-nav/default.nix b/melodic/mbf-simple-nav/default.nix index eb1a05fbd2..d59fd4f697 100644 --- a/melodic/mbf-simple-nav/default.nix +++ b/melodic/mbf-simple-nav/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''The mbf_simple_nav package contains a simple navigation server implementation of Move Base Flex (MBF). The simple navigation server is bound to no map representation. It provides actions for planning, controlling and recovering. MBF loads all defined plugins which are defined in the lists *planners*, *controllers* and *recovery_behaviors*. Each list holds a pair of a *name* and a *type*. The *type* defines which kind of plugin to load. The *name* defines under which name the plugin should be callable by the actions. It tries to load the defined plugins which implements the defined interfaces in mbf_abstract_core.''; - #license = lib.licenses.3-Clause BSD; + license = with lib.licenses; [ "3-Clause BSD" ]; }; } diff --git a/melodic/mbf-utility/default.nix b/melodic/mbf-utility/default.nix index fbf712c81b..b3dd48de80 100644 --- a/melodic/mbf-utility/default.nix +++ b/melodic/mbf-utility/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "7bd062652a4d93996bf5c705a3a02bf2506313a2c99993d0efd89210bd7fd5bf"; }; - buildInputs = [ tf2 tf2-ros tf2-geometry-msgs geometry-msgs tf roscpp ]; - propagatedBuildInputs = [ tf2 tf2-ros tf2-geometry-msgs geometry-msgs tf roscpp ]; + buildInputs = [ tf2-geometry-msgs roscpp tf2-ros tf2 tf geometry-msgs ]; + propagatedBuildInputs = [ tf2-geometry-msgs roscpp tf2-ros tf2 tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The mbf_utility package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mcl-3dl-msgs/default.nix b/melodic/mcl-3dl-msgs/default.nix index 021e9e55da..43910c6a89 100644 --- a/melodic/mcl-3dl-msgs/default.nix +++ b/melodic/mcl-3dl-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The mcl_3dl message definition package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mcl-3dl/default.nix b/melodic/mcl-3dl/default.nix index b4c10a379a..48812814a0 100644 --- a/melodic/mcl-3dl/default.nix +++ b/melodic/mcl-3dl/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''3-D/6-DOF localization for mobile robots with 3-D LIDAR(s)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/md49-base-controller/default.nix b/melodic/md49-base-controller/default.nix index dc7f7eb626..ee804ffb08 100644 --- a/melodic/md49-base-controller/default.nix +++ b/melodic/md49-base-controller/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The md49_base_controller package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/md49-messages/default.nix b/melodic/md49-messages/default.nix index e720e4c852..f930db83b5 100644 --- a/melodic/md49-messages/default.nix +++ b/melodic/md49-messages/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The md49_messages package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/md49-serialport/default.nix b/melodic/md49-serialport/default.nix index 9b6e886deb..144fedcdaa 100644 --- a/melodic/md49-serialport/default.nix +++ b/melodic/md49-serialport/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The md49_serialport package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/media-export/default.nix b/melodic/media-export/default.nix index d68ab4e9d1..0d25517128 100644 --- a/melodic/media-export/default.nix +++ b/melodic/media-export/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''Placeholder package enabling generic export of media paths.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/message-filters/default.nix b/melodic/message-filters/default.nix index aadfbf0ffc..33c851d313 100644 --- a/melodic/message-filters/default.nix +++ b/melodic/message-filters/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "3a6ce5214cb6b17a3af6268ddac55c5ac812ef09eb97685e6930da32799a8a3e"; }; - buildInputs = [ rostest rosconsole boost roscpp rosunit ]; + buildInputs = [ rosconsole boost rostest roscpp rosunit ]; propagatedBuildInputs = [ roscpp rosconsole ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A set of message filters which take in messages and may output those messages at a later time, based on the conditions that filter needs met.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/message-generation/default.nix b/melodic/message-generation/default.nix index becebe445d..bb52650f61 100644 --- a/melodic/message-generation/default.nix +++ b/melodic/message-generation/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, gencpp, gennodejs, genlisp, catkin, geneus, genmsg, genpy }: +{ lib, buildRosPackage, fetchurl, gencpp, genlisp, gennodejs, catkin, geneus, genmsg, genpy }: buildRosPackage { pname = "ros-melodic-message-generation"; version = "0.4.0"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "e868cdae2dcb54701e86484cb186fad8814bbd295db8a0224c4c14c3651d9303"; }; - propagatedBuildInputs = [ gencpp gennodejs geneus genmsg genpy genlisp ]; + propagatedBuildInputs = [ gencpp genlisp gennodejs geneus genmsg genpy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Package modeling the build-time dependencies for generating language bindings of messages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/message-runtime/default.nix b/melodic/message-runtime/default.nix index e69c63d789..1357e31692 100644 --- a/melodic/message-runtime/default.nix +++ b/melodic/message-runtime/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "70669611054c91c2d65ae94d5e2474198970929338cbb76411cb560902b1c800"; }; - propagatedBuildInputs = [ genpy cpp-common roscpp-serialization roscpp-traits rostime ]; + propagatedBuildInputs = [ cpp-common roscpp-traits rostime roscpp-serialization genpy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Package modeling the run-time dependencies for language bindings of messages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/microstrain-3dmgx2-imu/default.nix b/melodic/microstrain-3dmgx2-imu/default.nix index 8072eb4653..471503e0b7 100644 --- a/melodic/microstrain-3dmgx2-imu/default.nix +++ b/melodic/microstrain-3dmgx2-imu/default.nix @@ -5,11 +5,11 @@ { lib, buildRosPackage, fetchurl, std-srvs, self-test, tf, sensor-msgs, catkin, diagnostic-updater, message-generation, message-runtime, std-msgs, roscpp, log4cxx }: buildRosPackage { pname = "ros-melodic-microstrain-3dmgx2-imu"; - version = "1.5.12"; + version = "1.5.12-r1"; src = fetchurl { - url = https://github.com/ros-gbp/microstrain_3dmgx2_imu-release/archive/release/melodic/microstrain_3dmgx2_imu/1.5.12-0.tar.gz; - sha256 = "9aa8d9be95d5d65abd8cd0512ad5e2e0840843ff3feaeff12de80ef2f6e44780"; + url = https://github.com/ros-gbp/microstrain_3dmgx2_imu-release/archive/release/melodic/microstrain_3dmgx2_imu/1.5.12-1.tar.gz; + sha256 = "25b441c8be65da409431657796fe7577585e401b74e363c0a81f72177d9fd2e4"; }; buildInputs = [ std-srvs self-test sensor-msgs roscpp diagnostic-updater message-generation std-msgs tf log4cxx ]; @@ -20,6 +20,6 @@ buildRosPackage { description = ''A driver for IMUs compatible the microstrain 3DM-GX2 and 3DM-GX3 protocol. Includes a heavily modified standalone driver pulled from the player distribution, and a ROS node.''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/mini-maxwell/default.nix b/melodic/mini-maxwell/default.nix index 28cf950740..49eb62a045 100644 --- a/melodic/mini-maxwell/default.nix +++ b/melodic/mini-maxwell/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''mini_maxwell''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mir-actions/default.nix b/melodic/mir-actions/default.nix index 90a67613aa..35b885bcf9 100644 --- a/melodic/mir-actions/default.nix +++ b/melodic/mir-actions/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Action definitions for the MiR100 robot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mir-description/default.nix b/melodic/mir-description/default.nix index 2814852b98..a178bebf35 100644 --- a/melodic/mir-description/default.nix +++ b/melodic/mir-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''URDF description of the MiR100 robot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mir-driver/default.nix b/melodic/mir-driver/default.nix index 9e1499b48c..6e33e6b034 100644 --- a/melodic/mir-driver/default.nix +++ b/melodic/mir-driver/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "7d4cc4bb4f9ec504921acb945e036711c21a75de8dadafc38260dea35ef0b202"; }; - buildInputs = [ actionlib-msgs geometry-msgs mir-msgs sensor-msgs rospy rospy-message-converter rosgraph-msgs move-base-msgs nav-msgs mir-actions visualization-msgs dynamic-reconfigure std-msgs diagnostic-msgs roslaunch tf pythonPackages.websocket_client ]; - propagatedBuildInputs = [ actionlib-msgs geometry-msgs mir-msgs sensor-msgs mir-description rospy rospy-message-converter rosgraph-msgs move-base-msgs nav-msgs mir-actions robot-state-publisher dynamic-reconfigure std-msgs diagnostic-msgs visualization-msgs tf pythonPackages.websocket_client ]; + buildInputs = [ roslaunch actionlib-msgs geometry-msgs sensor-msgs rospy rospy-message-converter rosgraph-msgs move-base-msgs nav-msgs mir-actions visualization-msgs dynamic-reconfigure std-msgs diagnostic-msgs pythonPackages.websocket_client tf mir-msgs ]; + propagatedBuildInputs = [ actionlib-msgs geometry-msgs sensor-msgs mir-description rospy rospy-message-converter rosgraph-msgs move-base-msgs nav-msgs mir-actions robot-state-publisher dynamic-reconfigure std-msgs diagnostic-msgs pythonPackages.websocket_client tf visualization-msgs mir-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A reverse ROS bridge for the MiR100 robot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal asl20 ]; }; } diff --git a/melodic/mir-dwb-critics/default.nix b/melodic/mir-dwb-critics/default.nix index ca1afbde9d..7c3238378e 100644 --- a/melodic/mir-dwb-critics/default.nix +++ b/melodic/mir-dwb-critics/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, pluginlib, nav-grid-iterators, nav-core2, costmap-queue, sensor-msgs, catkin, nav-2d-msgs, dwb-critics, nav-2d-utils, angles, roscpp, dwb-local-planner, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, dwb-local-planner, pluginlib, nav-core2, costmap-queue, sensor-msgs, catkin, nav-2d-msgs, dwb-critics, nav-2d-utils, angles, roscpp, nav-grid-iterators, geometry-msgs }: buildRosPackage { pname = "ros-melodic-mir-dwb-critics"; version = "1.0.3"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "84b2d085130cc39d01978ba1b64100377bfd24b6b3a64a70f2f68c1bf8fb8866"; }; - buildInputs = [ pluginlib nav-grid-iterators nav-core2 costmap-queue sensor-msgs nav-2d-msgs dwb-critics nav-2d-utils angles roscpp dwb-local-planner geometry-msgs ]; - propagatedBuildInputs = [ pluginlib nav-grid-iterators nav-core2 costmap-queue sensor-msgs nav-2d-msgs dwb-critics nav-2d-utils angles roscpp dwb-local-planner geometry-msgs ]; + buildInputs = [ dwb-local-planner pluginlib nav-core2 costmap-queue sensor-msgs dwb-critics nav-2d-msgs nav-2d-utils angles roscpp nav-grid-iterators geometry-msgs ]; + propagatedBuildInputs = [ dwb-local-planner pluginlib nav-core2 costmap-queue sensor-msgs dwb-critics nav-2d-msgs nav-2d-utils angles roscpp nav-grid-iterators geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Trajectory critics for the dwb_local_planner that work well together with the SBPL global planner on the MiR robot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mir-gazebo/default.nix b/melodic/mir-gazebo/default.nix index 8ba34ac6de..acc59ad22e 100644 --- a/melodic/mir-gazebo/default.nix +++ b/melodic/mir-gazebo/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, gazebo-ros, controller-manager, catkin, mir-description, topic-tools, robot-localization, mir-driver, rostopic, robot-state-publisher, rqt-robot-steering, fake-localization, roslaunch, joint-state-publisher }: +{ lib, buildRosPackage, fetchurl, gazebo-ros, controller-manager, catkin, mir-description, fake-localization, robot-localization, mir-driver, rostopic, robot-state-publisher, rqt-robot-steering, topic-tools, roslaunch, joint-state-publisher }: buildRosPackage { pname = "ros-melodic-mir-gazebo"; version = "1.0.3"; @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ roslaunch ]; - propagatedBuildInputs = [ gazebo-ros controller-manager topic-tools mir-description robot-localization mir-driver rostopic robot-state-publisher rqt-robot-steering fake-localization joint-state-publisher ]; + propagatedBuildInputs = [ gazebo-ros controller-manager mir-description fake-localization robot-localization mir-driver rostopic robot-state-publisher rqt-robot-steering topic-tools joint-state-publisher ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Simulation specific launch and configuration files for the MiR100 robot.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mir-msgs/default.nix b/melodic/mir-msgs/default.nix index c7485f3a3f..c9ccff4610 100644 --- a/melodic/mir-msgs/default.nix +++ b/melodic/mir-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message definitions for the MiR100 robot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mir-navigation/default.nix b/melodic/mir-navigation/default.nix index 9eb89d066f..36ac2e5c4f 100644 --- a/melodic/mir-navigation/default.nix +++ b/melodic/mir-navigation/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Launch and configuration files for move_base, localization etc. on the MiR robot.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mir-robot/default.nix b/melodic/mir-robot/default.nix index e25077d338..4a7a5af347 100644 --- a/melodic/mir-robot/default.nix +++ b/melodic/mir-robot/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, mir-gazebo, mir-description, mir-dwb-critics, mir-actions, mir-driver, mir-navigation, mir-msgs }: +{ lib, buildRosPackage, fetchurl, catkin, mir-gazebo, mir-dwb-critics, mir-description, mir-actions, mir-navigation, mir-driver, mir-msgs }: buildRosPackage { pname = "ros-melodic-mir-robot"; version = "1.0.3"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "3037700c38b063bebea35ba8506ede308e9115ac5487946af9c30b604e23b1db"; }; - propagatedBuildInputs = [ mir-actions mir-driver mir-navigation mir-description mir-dwb-critics mir-gazebo mir-msgs ]; + propagatedBuildInputs = [ mir-description mir-gazebo mir-dwb-critics mir-actions mir-navigation mir-driver mir-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''URDF description, Gazebo simulation, navigation, bringup launch files, message and action descriptions for the MiR100 robot.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mk/default.nix b/melodic/mk/default.nix index 5b3fa81540..a40dbbf702 100644 --- a/melodic/mk/default.nix +++ b/melodic/mk/default.nix @@ -19,6 +19,6 @@ buildRosPackage { description = ''A collection of .mk include files for building ROS architectural elements. Most package authors should use cmake .mk, which calls CMake for the build of the package. The other files in this package are intended for use in exotic situations that mostly arise when importing 3rdparty code.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ml-classifiers/default.nix b/melodic/ml-classifiers/default.nix new file mode 100644 index 0000000000..caceae3d8f --- /dev/null +++ b/melodic/ml-classifiers/default.nix @@ -0,0 +1,23 @@ + +# Copyright 2019 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ros-environment, pluginlib, catkin, roslib, message-generation, message-runtime, eigen, std-msgs, roscpp }: +buildRosPackage { + pname = "ros-melodic-ml-classifiers"; + version = "1.0.1-r1"; + + src = fetchurl { + url = https://github.com/astuff/ml_classifiers-release/archive/release/melodic/ml_classifiers/1.0.1-1.tar.gz; + sha256 = "77588596b459e29cb22098164289c3b74e0a6326d372c99ce6025a422a21c564"; + }; + + buildInputs = [ pluginlib roscpp message-generation eigen std-msgs roslib ]; + propagatedBuildInputs = [ pluginlib roscpp message-runtime eigen std-msgs roslib ]; + nativeBuildInputs = [ ros-environment catkin ]; + + meta = { + description = ''ml_classifiers''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/melodic/mobileye-560-660-msgs/default.nix b/melodic/mobileye-560-660-msgs/default.nix index f204635e2f..abd997ae40 100644 --- a/melodic/mobileye-560-660-msgs/default.nix +++ b/melodic/mobileye-560-660-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message definitions for the Mobileye 560/660''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/mongodb-log/default.nix b/melodic/mongodb-log/default.nix index cf75328824..4484808d41 100644 --- a/melodic/mongodb-log/default.nix +++ b/melodic/mongodb-log/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "5ce0f217758fb3d15c24d5e6a00c59116028201b7ae95e3b5fa91af0ed8d5f2d"; }; - buildInputs = [ rosgraph rostopic mongodb-store rospy openssl sensor-msgs roslib tf ]; - propagatedBuildInputs = [ rosgraph rostopic mongodb-store rospy pythonPackages.pymongo sensor-msgs roslib tf ]; + buildInputs = [ tf sensor-msgs rosgraph rostopic mongodb-store rospy openssl roslib ]; + propagatedBuildInputs = [ pythonPackages.pymongo tf sensor-msgs rosgraph rostopic mongodb-store rospy roslib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The mongodb_log package''; - #license = lib.licenses.GPLv2; + license = with lib.licenses; [ gpl2 ]; }; } diff --git a/melodic/mongodb-store-msgs/default.nix b/melodic/mongodb-store-msgs/default.nix index a5b1c5b1aa..5cc14524d9 100644 --- a/melodic/mongodb-store-msgs/default.nix +++ b/melodic/mongodb-store-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The mongodb_store_msgs package''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/mongodb-store/default.nix b/melodic/mongodb-store/default.nix index 3938c615eb..66f42eead6 100644 --- a/melodic/mongodb-store/default.nix +++ b/melodic/mongodb-store/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, mongodb-store-msgs, std-srvs, topic-tools, pythonPackages, catkin, rostest, message-generation, std-msgs, rospy, openssl, mongodb, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, mongodb-store-msgs, std-srvs, openssl, catkin, pythonPackages, rostest, std-msgs, message-generation, rospy, topic-tools, mongodb, roscpp, geometry-msgs }: buildRosPackage { pname = "ros-melodic-mongodb-store"; version = "0.5.0-r5"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "6a139eb69db2efaa95e3b7a013a61624e082e580bdc4c8ba2f331ecda89a0b39"; }; - buildInputs = [ mongodb-store-msgs std-srvs topic-tools rostest message-generation std-msgs rospy openssl mongodb pythonPackages.catkin-pkg roscpp geometry-msgs ]; + buildInputs = [ openssl mongodb-store-msgs std-srvs topic-tools rostest message-generation rospy std-msgs mongodb pythonPackages.catkin-pkg roscpp geometry-msgs ]; propagatedBuildInputs = [ mongodb-store-msgs std-srvs pythonPackages.pymongo topic-tools rospy std-msgs mongodb roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A package to support MongoDB-based storage and analysis for data from a ROS system, eg. saved messages, configurations etc''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/monocam-settler/default.nix b/melodic/monocam-settler/default.nix index 5f6dbd599c..2928a125f8 100644 --- a/melodic/monocam-settler/default.nix +++ b/melodic/monocam-settler/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "e071a63f48ee1ed211bca1e5bcd85a46afce004dc18ba4226aee484dc7e309c7"; }; - buildInputs = [ settlerlib actionlib rosconsole actionlib-msgs roscpp-serialization std-msgs ]; - propagatedBuildInputs = [ settlerlib actionlib rosconsole actionlib-msgs roscpp-serialization std-msgs ]; + buildInputs = [ rosconsole actionlib-msgs settlerlib actionlib roscpp-serialization std-msgs ]; + propagatedBuildInputs = [ rosconsole actionlib-msgs settlerlib actionlib roscpp-serialization std-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Listens on a ImageFeatures topic, and waits for the data to settle. This package is experimental and unstable. Expect its APIs to change.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mouse-teleop/default.nix b/melodic/mouse-teleop/default.nix index 29cf181ccf..1bc494e2b1 100644 --- a/melodic/mouse-teleop/default.nix +++ b/melodic/mouse-teleop/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A mouse teleop tool for holonomic mobile robots.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/move-base-flex/default.nix b/melodic/move-base-flex/default.nix index d244507d11..b5028cad66 100644 --- a/melodic/move-base-flex/default.nix +++ b/melodic/move-base-flex/default.nix @@ -19,6 +19,6 @@ buildRosPackage { description = ''Move Base Flex (MBF) is a backwards-compatible replacement for move_base. MBF can use existing plugins for move_base, and provides an enhanced version of the planner, controller and recovery plugin ROS interfaces. It exposes action servers for planning, controlling and recovering, providing detailed information of the current state and the plugin’s feedback. An external executive logic can use MBF and its actions to perform smart and flexible navigation strategies. Furthermore, MBF enables the use of other map representations, e.g. meshes or grid_map This package is a meta package and refers to the Move Base Flex stack packages.The abstract core of MBF – without any binding to a map representation – is represented by the mbf_abstract_nav and the mbf_abstract_core. For navigation on costmaps see mbf_costmap_nav and mbf_costmap_core.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/move-base-msgs/default.nix b/melodic/move-base-msgs/default.nix index f9e6315f83..bf38f7dff3 100644 --- a/melodic/move-base-msgs/default.nix +++ b/melodic/move-base-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Holds the action description and relevant messages for the move_base package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/move-base/default.nix b/melodic/move-base/default.nix index 1c67368c38..e31e29233f 100644 --- a/melodic/move-base/default.nix +++ b/melodic/move-base/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rotate-recovery, rospy, actionlib, clear-costmap-recovery, geometry-msgs, message-generation, message-runtime, std-srvs, tf2-geometry-msgs, navfn, catkin, tf2-ros, move-base-msgs, nav-msgs, roscpp, visualization-msgs, costmap-2d, cmake-modules, base-local-planner, pluginlib, nav-core, dynamic-reconfigure }: +{ lib, buildRosPackage, fetchurl, rotate-recovery, actionlib, clear-costmap-recovery, rospy, geometry-msgs, message-generation, message-runtime, std-srvs, tf2-geometry-msgs, navfn, catkin, tf2-ros, move-base-msgs, nav-msgs, roscpp, visualization-msgs, costmap-2d, cmake-modules, base-local-planner, pluginlib, nav-core, dynamic-reconfigure }: buildRosPackage { pname = "ros-melodic-move-base"; version = "1.16.2"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "63af31b19a053e4877e0af0d899b59da73df19a65258c8a823f41afed51e851d"; }; - buildInputs = [ std-srvs tf2-geometry-msgs navfn rotate-recovery tf2-ros move-base-msgs nav-msgs actionlib clear-costmap-recovery rospy visualization-msgs roscpp geometry-msgs costmap-2d cmake-modules base-local-planner pluginlib nav-core message-generation dynamic-reconfigure ]; - propagatedBuildInputs = [ costmap-2d std-srvs pluginlib base-local-planner navfn nav-core rotate-recovery roscpp rospy move-base-msgs tf2-ros nav-msgs actionlib message-runtime dynamic-reconfigure clear-costmap-recovery visualization-msgs geometry-msgs ]; + buildInputs = [ rotate-recovery actionlib rospy clear-costmap-recovery geometry-msgs message-generation std-srvs tf2-geometry-msgs navfn tf2-ros move-base-msgs nav-msgs visualization-msgs roscpp costmap-2d cmake-modules base-local-planner pluginlib nav-core dynamic-reconfigure ]; + propagatedBuildInputs = [ costmap-2d std-srvs pluginlib base-local-planner navfn nav-core rotate-recovery tf2-ros rospy move-base-msgs nav-msgs actionlib message-runtime visualization-msgs dynamic-reconfigure clear-costmap-recovery roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The move_base package provides an implementation of an action (see the actionlib package) that, given a goal in the world, will attempt to reach it with a mobile base. The move_base node links together a global and local planner to accomplish its global navigation task. It supports any global planner adhering to the nav_core::BaseGlobalPlanner interface specified in the nav_core package and any local planner adhering to the nav_core::BaseLocalPlanner interface specified in the nav_core package. The move_base node also maintains two costmaps, one for the global planner, and one for a local planner (see the costmap_2d package) that are used to accomplish navigation tasks.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/move-slow-and-clear/default.nix b/melodic/move-slow-and-clear/default.nix index 526bf9e876..d4097e9bec 100644 --- a/melodic/move-slow-and-clear/default.nix +++ b/melodic/move-slow-and-clear/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''move_slow_and_clear''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-chomp-optimizer-adapter/default.nix b/melodic/moveit-chomp-optimizer-adapter/default.nix index a0835cd705..f2835dfc3c 100644 --- a/melodic/moveit-chomp-optimizer-adapter/default.nix +++ b/melodic/moveit-chomp-optimizer-adapter/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''MoveIt planning request adapter utilizing chomp for solution optimization''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-controller-manager-example/default.nix b/melodic/moveit-controller-manager-example/default.nix index b154f5320a..5dc4ee557f 100644 --- a/melodic/moveit-controller-manager-example/default.nix +++ b/melodic/moveit-controller-manager-example/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''An example controller manager plugin for MoveIt. This is not functional code.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-experimental/default.nix b/melodic/moveit-experimental/default.nix index 93d6e43877..fb967712e4 100644 --- a/melodic/moveit-experimental/default.nix +++ b/melodic/moveit-experimental/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''Experimental packages for MoveIt!''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-fake-controller-manager/default.nix b/melodic/moveit-fake-controller-manager/default.nix index d7393492bf..2245f088d4 100644 --- a/melodic/moveit-fake-controller-manager/default.nix +++ b/melodic/moveit-fake-controller-manager/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''A fake controller manager plugin for MoveIt.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-kinematics/default.nix b/melodic/moveit-kinematics/default.nix index be3f6a347d..07213b4d9a 100644 --- a/melodic/moveit-kinematics/default.nix +++ b/melodic/moveit-kinematics/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "985cac460cfb1e2a2c9d0c9715fd3f8fc03a5275ef0d7056cd79e5b6048cc3a3"; }; - buildInputs = [ moveit-ros-planning tf2 moveit-core orocos-kdl pluginlib roscpp tf2-kdl eigen ]; + buildInputs = [ moveit-ros-planning orocos-kdl pluginlib tf2-kdl tf2 moveit-core eigen roscpp ]; checkInputs = [ moveit-resources rostest xmlrpcpp ]; propagatedBuildInputs = [ moveit-ros-planning orocos-kdl pluginlib tf2-kdl tf2 moveit-core pythonPackages.lxml eigen roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Package for all inverse kinematics solvers in MoveIt!''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-msgs/default.nix b/melodic/moveit-msgs/default.nix index c2ee385e84..c1c282c0f0 100644 --- a/melodic/moveit-msgs/default.nix +++ b/melodic/moveit-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages, services and actions used by MoveIt''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-planners-chomp/default.nix b/melodic/moveit-planners-chomp/default.nix index 99dc996507..0a08624a9c 100644 --- a/melodic/moveit-planners-chomp/default.nix +++ b/melodic/moveit-planners-chomp/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The interface for using CHOMP within MoveIt!''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-planners-ompl/default.nix b/melodic/moveit-planners-ompl/default.nix index e90800bb20..7bad8483df 100644 --- a/melodic/moveit-planners-ompl/default.nix +++ b/melodic/moveit-planners-ompl/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "ff42c067ffeea4f9430e365946b5a958bec447d2e0e5a4fee66eee6a306e51df"; }; - buildInputs = [ moveit-ros-planning pluginlib rosconsole moveit-core dynamic-reconfigure roscpp ompl tf2-ros ]; + buildInputs = [ moveit-ros-planning pluginlib rosconsole ompl tf2-ros moveit-core dynamic-reconfigure roscpp ]; checkInputs = [ moveit-resources rosunit ]; - propagatedBuildInputs = [ moveit-ros-planning pluginlib rosconsole moveit-core dynamic-reconfigure roscpp ompl tf2-ros ]; + propagatedBuildInputs = [ moveit-ros-planning pluginlib rosconsole ompl tf2-ros moveit-core dynamic-reconfigure roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''MoveIt! interface to OMPL''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-planners/default.nix b/melodic/moveit-planners/default.nix index 33d48ef5ab..f110ff94cb 100644 --- a/melodic/moveit-planners/default.nix +++ b/melodic/moveit-planners/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Metapacakge that installs all available planners for MoveIt''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-plugins/default.nix b/melodic/moveit-plugins/default.nix index 7e2592411c..2007985beb 100644 --- a/melodic/moveit-plugins/default.nix +++ b/melodic/moveit-plugins/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Metapackage for MoveIt! plugins.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-resources/default.nix b/melodic/moveit-resources/default.nix index c51ccc2dfc..3224b3b31c 100644 --- a/melodic/moveit-resources/default.nix +++ b/melodic/moveit-resources/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Resources used for MoveIt! testing''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-ros-benchmarks/default.nix b/melodic/moveit-ros-benchmarks/default.nix index d6a7a7c6cf..5b4fb8fd52 100644 --- a/melodic/moveit-ros-benchmarks/default.nix +++ b/melodic/moveit-ros-benchmarks/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "3168565928ff160fe763f5c06a80f70ef3dd4be70cf043eedc35ef1aefc05e4e"; }; - buildInputs = [ moveit-ros-planning moveit-ros-warehouse pluginlib tf2-eigen roscpp ]; - propagatedBuildInputs = [ moveit-ros-planning moveit-ros-warehouse pluginlib tf2-eigen roscpp ]; + buildInputs = [ moveit-ros-planning pluginlib moveit-ros-warehouse tf2-eigen roscpp ]; + propagatedBuildInputs = [ moveit-ros-planning pluginlib moveit-ros-warehouse tf2-eigen roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Enhanced tools for benchmarks in MoveIt!''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-ros-control-interface/default.nix b/melodic/moveit-ros-control-interface/default.nix index 39f45914c4..03f49f4871 100644 --- a/melodic/moveit-ros-control-interface/default.nix +++ b/melodic/moveit-ros-control-interface/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "ab7d709853069646411c7051fabf921f2734dbf55858457e9525024f21877e20"; }; - buildInputs = [ moveit-simple-controller-manager controller-manager-msgs moveit-core pluginlib actionlib trajectory-msgs ]; - propagatedBuildInputs = [ moveit-simple-controller-manager controller-manager-msgs moveit-core pluginlib actionlib trajectory-msgs ]; + buildInputs = [ pluginlib trajectory-msgs moveit-simple-controller-manager controller-manager-msgs moveit-core actionlib ]; + propagatedBuildInputs = [ pluginlib trajectory-msgs moveit-simple-controller-manager controller-manager-msgs moveit-core actionlib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ros_control controller manager interface for MoveIt!''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-ros-manipulation/default.nix b/melodic/moveit-ros-manipulation/default.nix index 8c73a4ca93..977ecfb916 100644 --- a/melodic/moveit-ros-manipulation/default.nix +++ b/melodic/moveit-ros-manipulation/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Components of MoveIt! used for manipulation''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-ros-move-group/default.nix b/melodic/moveit-ros-move-group/default.nix index 1e4897f872..f5dd621baf 100644 --- a/melodic/moveit-ros-move-group/default.nix +++ b/melodic/moveit-ros-move-group/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The move_group node for MoveIt''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-ros-perception/default.nix b/melodic/moveit-ros-perception/default.nix index b5819b593e..7b9265d88f 100644 --- a/melodic/moveit-ros-perception/default.nix +++ b/melodic/moveit-ros-perception/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rosconsole, cv-bridge, octomap, image-transport, message-filters, moveit-core, libGL, tf2-geometry-msgs, catkin, tf2-ros, urdf, moveit-msgs, libGLU, roscpp, eigen, pluginlib, sensor-msgs, glew, tf2, tf2-eigen, object-recognition-msgs, freeglut, rosunit }: +{ lib, buildRosPackage, fetchurl, rosconsole, cv-bridge, freeglut, octomap, image-transport, message-filters, moveit-core, libGL, tf2-geometry-msgs, catkin, tf2-ros, urdf, moveit-msgs, libGLU, roscpp, eigen, pluginlib, sensor-msgs, tf2, tf2-eigen, object-recognition-msgs, glew, rosunit }: buildRosPackage { pname = "ros-melodic-moveit-ros-perception"; version = "1.0.1"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "17224556fc107529db910afacec08cdd3c00af38e518e93c878bdc0d7b0faa5a"; }; - buildInputs = [ rosconsole tf2-geometry-msgs cv-bridge tf2-ros freeglut octomap urdf libGLU moveit-msgs roscpp eigen pluginlib image-transport sensor-msgs message-filters tf2 moveit-core tf2-eigen object-recognition-msgs glew libGL ]; + buildInputs = [ rosconsole cv-bridge freeglut octomap image-transport message-filters moveit-core libGL tf2-geometry-msgs tf2-ros urdf libGLU moveit-msgs roscpp eigen pluginlib sensor-msgs tf2 tf2-eigen object-recognition-msgs glew ]; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ rosconsole tf2-geometry-msgs cv-bridge tf2-ros freeglut octomap urdf libGLU moveit-msgs roscpp pluginlib image-transport sensor-msgs message-filters tf2 moveit-core tf2-eigen object-recognition-msgs glew libGL ]; + propagatedBuildInputs = [ rosconsole cv-bridge freeglut octomap image-transport message-filters moveit-core libGL tf2-geometry-msgs tf2-ros urdf libGLU moveit-msgs roscpp pluginlib sensor-msgs tf2 tf2-eigen object-recognition-msgs glew ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Components of MoveIt! connecting to perception''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-ros-planning-interface/default.nix b/melodic/moveit-ros-planning-interface/default.nix index 512c8a964e..a09c24c58f 100644 --- a/melodic/moveit-ros-planning-interface/default.nix +++ b/melodic/moveit-ros-planning-interface/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Components of MoveIt! that offer simpler interfaces to planning and execution''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-ros-planning/default.nix b/melodic/moveit-ros-planning/default.nix index 1dc2f6523c..222cafdacc 100644 --- a/melodic/moveit-ros-planning/default.nix +++ b/melodic/moveit-ros-planning/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Planning components of MoveIt! that use ROS''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-ros-robot-interaction/default.nix b/melodic/moveit-ros-robot-interaction/default.nix index a861a80105..ceefde451a 100644 --- a/melodic/moveit-ros-robot-interaction/default.nix +++ b/melodic/moveit-ros-robot-interaction/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "7667565bf9ad5150421244374497baff91b46bc5c8ed9dd3f53e2f854480a43d"; }; - buildInputs = [ moveit-ros-planning tf2 interactive-markers tf2-geometry-msgs tf2-eigen roscpp tf2-ros ]; + buildInputs = [ moveit-ros-planning tf2-geometry-msgs tf2-ros tf2 interactive-markers tf2-eigen roscpp ]; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ moveit-ros-planning tf2 interactive-markers tf2-geometry-msgs tf2-eigen roscpp tf2-ros ]; + propagatedBuildInputs = [ moveit-ros-planning tf2-geometry-msgs tf2-ros tf2 interactive-markers tf2-eigen roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Components of MoveIt! that offer interaction via interactive markers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-ros-visualization/default.nix b/melodic/moveit-ros-visualization/default.nix index ae822ec624..172894b663 100644 --- a/melodic/moveit-ros-visualization/default.nix +++ b/melodic/moveit-ros-visualization/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Components of MoveIt! that offer visualization''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-ros-warehouse/default.nix b/melodic/moveit-ros-warehouse/default.nix index 58e1e7f9e4..5726b46d15 100644 --- a/melodic/moveit-ros-warehouse/default.nix +++ b/melodic/moveit-ros-warehouse/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "f2200ad880c214ba2af00fb36d58740509ca51efc0e6213b2fc4615005230baf"; }; - buildInputs = [ moveit-ros-planning rosconsole tf2-eigen warehouse-ros roscpp tf2-ros ]; - propagatedBuildInputs = [ moveit-ros-planning rosconsole tf2-eigen warehouse-ros roscpp tf2-ros ]; + buildInputs = [ moveit-ros-planning rosconsole tf2-ros tf2-eigen warehouse-ros roscpp ]; + propagatedBuildInputs = [ moveit-ros-planning rosconsole tf2-ros tf2-eigen warehouse-ros roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Components of MoveIt! connecting to MongoDB''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-ros/default.nix b/melodic/moveit-ros/default.nix index 1c480393bd..4febc4cc3e 100644 --- a/melodic/moveit-ros/default.nix +++ b/melodic/moveit-ros/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Components of MoveIt! that use ROS''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-runtime/default.nix b/melodic/moveit-runtime/default.nix index 2898bb4c62..85d981dc12 100644 --- a/melodic/moveit-runtime/default.nix +++ b/melodic/moveit-runtime/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''moveit_runtime meta package contains MoveIt! packages that are essential for its runtime (e.g. running MoveIt! on robots).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-setup-assistant/default.nix b/melodic/moveit-setup-assistant/default.nix index d33840a276..3248f2620d 100644 --- a/melodic/moveit-setup-assistant/default.nix +++ b/melodic/moveit-setup-assistant/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Generates a configuration package that makes it easy to use MoveIt!''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-sim-controller/default.nix b/melodic/moveit-sim-controller/default.nix index 1e4c9c88cc..fa5abc0099 100644 --- a/melodic/moveit-sim-controller/default.nix +++ b/melodic/moveit-sim-controller/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "3d7a3062afc99ff36fa906e8796297a7ac3e1a1dea416d71a06ce22bdbfe18e9"; }; - buildInputs = [ moveit-ros-planning moveit-core roslint ros-control-boilerplate rosparam-shortcuts roscpp ]; - propagatedBuildInputs = [ moveit-ros-planning moveit-core ros-control-boilerplate rosparam-shortcuts roscpp ]; + buildInputs = [ moveit-ros-planning roslint ros-control-boilerplate moveit-core rosparam-shortcuts roscpp ]; + propagatedBuildInputs = [ moveit-ros-planning ros-control-boilerplate moveit-core rosparam-shortcuts roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A simulation interface for a hardware interface for ros_control, and loads default joint values from SRDF''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-simple-controller-manager/default.nix b/melodic/moveit-simple-controller-manager/default.nix index 8086148559..6ed0bbc89b 100644 --- a/melodic/moveit-simple-controller-manager/default.nix +++ b/melodic/moveit-simple-controller-manager/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "911f5903df3144ae4ae248752b196acb700a83536c1662fd4b0005badf1d7eee"; }; - buildInputs = [ moveit-core pluginlib actionlib control-msgs roscpp ]; - propagatedBuildInputs = [ moveit-core pluginlib actionlib control-msgs roscpp ]; + buildInputs = [ pluginlib control-msgs moveit-core actionlib roscpp ]; + propagatedBuildInputs = [ pluginlib control-msgs moveit-core actionlib roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A generic, simple controller manager plugin for MoveIt.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit-visual-tools/default.nix b/melodic/moveit-visual-tools/default.nix index e5eecbd7d7..5330c33491 100644 --- a/melodic/moveit-visual-tools/default.nix +++ b/melodic/moveit-visual-tools/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Helper functions for displaying and debugging MoveIt! data in Rviz via published markers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/moveit/default.nix b/melodic/moveit/default.nix index 9327d515fd..0c6fd9d76d 100644 --- a/melodic/moveit/default.nix +++ b/melodic/moveit/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "214f00c2a6ecf941adf7f2fb496023e48d27ee616d030b4dda85145d02319492"; }; - propagatedBuildInputs = [ moveit-commander moveit-core moveit-planners moveit-plugins moveit-setup-assistant moveit-ros ]; + propagatedBuildInputs = [ moveit-ros moveit-commander moveit-core moveit-planners moveit-plugins moveit-setup-assistant ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Meta package that contains all essential package of MoveIt!. Until Summer 2016 MoveIt! had been developed over multiple repositories, where developers' usability and maintenance effort was non-trivial. See the detailed discussion for the merge of several repositories.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/movie-publisher/default.nix b/melodic/movie-publisher/default.nix index a4e1c8568b..23b85eecff 100644 --- a/melodic/movie-publisher/default.nix +++ b/melodic/movie-publisher/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "d25ff36cadc9c0e22259a1e55b9e761efcc0e9ed0f4c1fcd30c1f919dfb90f4b"; }; - propagatedBuildInputs = [ pythonPackages.imageio rospy sensor-msgs cv-bridge ffmpeg rosbash-params pythonPackages.opencv3 ]; + propagatedBuildInputs = [ sensor-msgs cv-bridge ffmpeg pythonPackages.opencv3 pythonPackages.imageio rospy rosbash-params ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Node for using a video file as video topic source.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-bridge/default.nix b/melodic/mrpt-bridge/default.nix index 477cd159e9..9f36232e1b 100644 --- a/melodic/mrpt-bridge/default.nix +++ b/melodic/mrpt-bridge/default.nix @@ -14,11 +14,11 @@ buildRosPackage { buildInputs = [ marker-msgs pcl sensor-msgs cv-bridge qt5.qtbase roscpp nav-msgs mrpt-msgs message-generation mrpt1 std-msgs tf pcl-conversions geometry-msgs stereo-msgs ]; checkInputs = [ gtest rosunit ]; - propagatedBuildInputs = [ marker-msgs tf sensor-msgs cv-bridge message-generation mrpt-msgs message-runtime nav-msgs mrpt1 std-msgs roscpp geometry-msgs stereo-msgs ]; + propagatedBuildInputs = [ marker-msgs tf sensor-msgs cv-bridge nav-msgs message-generation mrpt-msgs message-runtime mrpt1 std-msgs roscpp geometry-msgs stereo-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''C++ library to convert between ROS messages and MRPT classes''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-ekf-slam-2d/default.nix b/melodic/mrpt-ekf-slam-2d/default.nix index fe1362d1a7..ef2ea0c5a0 100644 --- a/melodic/mrpt-ekf-slam-2d/default.nix +++ b/melodic/mrpt-ekf-slam-2d/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "b9d8fdcaf4bce0c98375bb5c7a2db364d986b0818da8e489991b0bc4321901c8"; }; - buildInputs = [ mrpt-bridge tf sensor-msgs roscpp nav-msgs mrpt1 visualization-msgs dynamic-reconfigure std-msgs roslaunch roslib ]; - propagatedBuildInputs = [ mrpt-bridge tf sensor-msgs mrpt-rawlog roscpp roslib nav-msgs rviz mrpt1 dynamic-reconfigure std-msgs roslaunch visualization-msgs ]; + buildInputs = [ mrpt-bridge tf sensor-msgs roslib nav-msgs mrpt1 visualization-msgs dynamic-reconfigure std-msgs roslaunch roscpp ]; + propagatedBuildInputs = [ mrpt-bridge sensor-msgs mrpt-rawlog roscpp roslib nav-msgs rviz mrpt1 visualization-msgs dynamic-reconfigure std-msgs roslaunch tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package is a wrapper for the implementation of EKF-based SLAM with range-bearing sensors, odometry, and a 2D (+heading) robot pose, and 2D landmarks.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-ekf-slam-3d/default.nix b/melodic/mrpt-ekf-slam-3d/default.nix index ad4ec2bb22..4dd06155b1 100644 --- a/melodic/mrpt-ekf-slam-3d/default.nix +++ b/melodic/mrpt-ekf-slam-3d/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "3af75a1f55059892760c9d6d5939c46e48d9d9bc4b6087c0755209bafba88039"; }; - buildInputs = [ mrpt-bridge cmake-modules tf sensor-msgs roscpp nav-msgs mrpt1 visualization-msgs dynamic-reconfigure std-msgs roslaunch roslib ]; - propagatedBuildInputs = [ mrpt-bridge cmake-modules tf sensor-msgs mrpt-rawlog roscpp roslib nav-msgs rviz mrpt1 dynamic-reconfigure std-msgs roslaunch visualization-msgs ]; + buildInputs = [ mrpt-bridge cmake-modules tf sensor-msgs roslib nav-msgs mrpt1 visualization-msgs dynamic-reconfigure std-msgs roslaunch roscpp ]; + propagatedBuildInputs = [ mrpt-bridge cmake-modules sensor-msgs mrpt-rawlog roscpp roslib nav-msgs rviz mrpt1 visualization-msgs dynamic-reconfigure std-msgs roslaunch tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package is a wrapper for the implementation of EKF-based SLAM with range-bearing sensors, odometry, a full 6D robot pose, and 3D landmarks.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-graphslam-2d/default.nix b/melodic/mrpt-graphslam-2d/default.nix index bfeed788e4..1dda3047d8 100644 --- a/melodic/mrpt-graphslam-2d/default.nix +++ b/melodic/mrpt-graphslam-2d/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Implement graphSLAM using the mrpt-graphslam library, in an online fashion by directly reading measurements off ROS Topics.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-icp-slam-2d/default.nix b/melodic/mrpt-icp-slam-2d/default.nix index 9b754be1ef..acb63e0095 100644 --- a/melodic/mrpt-icp-slam-2d/default.nix +++ b/melodic/mrpt-icp-slam-2d/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "aca7e53d844693e92f1d043660b5982dce6739932f68f63943fb87763bb6a616"; }; - buildInputs = [ mrpt-bridge tf sensor-msgs roscpp nav-msgs mrpt1 visualization-msgs dynamic-reconfigure std-msgs roslaunch roslib ]; - propagatedBuildInputs = [ mrpt-bridge tf sensor-msgs mrpt-rawlog roscpp roslib nav-msgs rviz mrpt1 dynamic-reconfigure std-msgs roslaunch visualization-msgs ]; + buildInputs = [ mrpt-bridge tf sensor-msgs roslib nav-msgs mrpt1 visualization-msgs dynamic-reconfigure std-msgs roslaunch roscpp ]; + propagatedBuildInputs = [ mrpt-bridge sensor-msgs mrpt-rawlog roscpp roslib nav-msgs rviz mrpt1 visualization-msgs dynamic-reconfigure std-msgs roslaunch tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''mrpt_icp_slam_2d contains a wrapper on MRPT's 2D ICP-SLAM algorithms.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-local-obstacles/default.nix b/melodic/mrpt-local-obstacles/default.nix index 46eef45397..1cfbb63019 100644 --- a/melodic/mrpt-local-obstacles/default.nix +++ b/melodic/mrpt-local-obstacles/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "15f6abde9e318e1e0afaf27bc6cc20bd84943a5d14cb0f22f509686bf4a492a6"; }; - buildInputs = [ mrpt1 mrpt-bridge visualization-msgs dynamic-reconfigure sensor-msgs tf roscpp ]; - propagatedBuildInputs = [ mrpt1 mrpt-bridge visualization-msgs dynamic-reconfigure sensor-msgs tf roscpp ]; + buildInputs = [ sensor-msgs roscpp mrpt1 visualization-msgs dynamic-reconfigure mrpt-bridge tf ]; + propagatedBuildInputs = [ sensor-msgs roscpp mrpt1 visualization-msgs dynamic-reconfigure mrpt-bridge tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Maintains a local obstacle map (point cloud, voxels or occupancy grid) from recent sensor readings within a configurable time window.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-localization/default.nix b/melodic/mrpt-localization/default.nix index 747aa0cd72..99f59ea519 100644 --- a/melodic/mrpt-localization/default.nix +++ b/melodic/mrpt-localization/default.nix @@ -21,6 +21,6 @@ buildRosPackage { The interface is similar to amcl (http://wiki.ros.org/amcl) but supports different particle-filter algorithms, several grid maps at different heights, range-only localization, etc.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal bsdOriginal ]; }; } diff --git a/melodic/mrpt-map/default.nix b/melodic/mrpt-map/default.nix index 34149b3478..580af6e0ea 100644 --- a/melodic/mrpt-map/default.nix +++ b/melodic/mrpt-map/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, tf, sensor-msgs, catkin, nav-msgs, mrpt1, std-msgs, mrpt-bridge, roscpp }: +{ lib, buildRosPackage, fetchurl, sensor-msgs, catkin, roscpp, nav-msgs, mrpt1, std-msgs, mrpt-bridge, tf }: buildRosPackage { pname = "ros-melodic-mrpt-map"; version = "0.1.24"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "0d3b69ed360dd1b9f7be6bc81108e7cb2f16c218d4c445b47af66315c0df6ebc"; }; - buildInputs = [ nav-msgs mrpt1 mrpt-bridge std-msgs sensor-msgs roscpp tf ]; - propagatedBuildInputs = [ nav-msgs mrpt1 mrpt-bridge std-msgs sensor-msgs roscpp tf ]; + buildInputs = [ tf sensor-msgs nav-msgs mrpt1 std-msgs mrpt-bridge roscpp ]; + propagatedBuildInputs = [ tf sensor-msgs nav-msgs mrpt1 std-msgs mrpt-bridge roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The mrpt_map is able to publish a mrpt map as ros occupancy grid like the map_server''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-msgs/default.nix b/melodic/mrpt-msgs/default.nix index 50b990f3a4..d5fddb56f2 100644 --- a/melodic/mrpt-msgs/default.nix +++ b/melodic/mrpt-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS messages for MRPT classes and objects''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-navigation/default.nix b/melodic/mrpt-navigation/default.nix index 73b5c88487..059d689eca 100644 --- a/melodic/mrpt-navigation/default.nix +++ b/melodic/mrpt-navigation/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "a54df1d35bffe4dbed64661144226c3077f14fbcb2097c6e84720ecaca7f7540"; }; - propagatedBuildInputs = [ mrpt-rawlog mrpt-reactivenav2d mrpt-local-obstacles mrpt-tutorials mrpt-localization mrpt-map ]; + propagatedBuildInputs = [ mrpt-reactivenav2d mrpt-tutorials mrpt-localization mrpt-map mrpt-rawlog mrpt-local-obstacles ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Tools related to the Mobile Robot Programming Toolkit (MRPT). Refer to http://wiki.ros.org/mrpt_navigation for further documentation.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-rawlog/default.nix b/melodic/mrpt-rawlog/default.nix index 0d569c90db..c1e4da6e9f 100644 --- a/melodic/mrpt-rawlog/default.nix +++ b/melodic/mrpt-rawlog/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package enables you to record a rawlog from a ROS drive robot. At the moment the package is able to deal with odometry and 2d laser scans.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-rbpf-slam/default.nix b/melodic/mrpt-rbpf-slam/default.nix index 8037632ea6..6fb22f36c9 100644 --- a/melodic/mrpt-rbpf-slam/default.nix +++ b/melodic/mrpt-rbpf-slam/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, roslaunch, tf, sensor-msgs, catkin, mrpt-rawlog, roslib, nav-msgs, mrpt1, rviz, visualization-msgs, dynamic-reconfigure, std-msgs, mrpt-bridge, roscpp, mvsim }: +{ lib, buildRosPackage, fetchurl, roslaunch, sensor-msgs, catkin, mrpt-rawlog, roscpp, roslib, nav-msgs, mrpt1, rviz, visualization-msgs, dynamic-reconfigure, std-msgs, mrpt-bridge, tf, mvsim }: buildRosPackage { pname = "ros-melodic-mrpt-rbpf-slam"; version = "0.1.9"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "ea3e077a2a2f682268bfe6ca88b95f03c26823ef8aa2f9cc50cc7a1c534228c2"; }; - buildInputs = [ mrpt-bridge tf sensor-msgs roscpp nav-msgs mrpt1 visualization-msgs dynamic-reconfigure std-msgs roslaunch roslib ]; - propagatedBuildInputs = [ roslaunch tf sensor-msgs mrpt-rawlog roscpp nav-msgs mrpt1 rviz visualization-msgs dynamic-reconfigure std-msgs mrpt-bridge roslib mvsim ]; + buildInputs = [ mrpt-bridge sensor-msgs roscpp roslib nav-msgs mrpt1 visualization-msgs dynamic-reconfigure std-msgs roslaunch tf ]; + propagatedBuildInputs = [ roslaunch sensor-msgs mrpt-rawlog roscpp roslib nav-msgs mrpt1 rviz visualization-msgs dynamic-reconfigure std-msgs mrpt-bridge tf mvsim ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package is used for gridmap SLAM. The interface is similar to gmapping (http://wiki.ros.org/gmapping) but the package supports different particle-filter algorithms, range-only SLAM, can work with several grid maps simultaneously and more.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-reactivenav2d/default.nix b/melodic/mrpt-reactivenav2d/default.nix index 95aea3c3fc..f958f81098 100644 --- a/melodic/mrpt-reactivenav2d/default.nix +++ b/melodic/mrpt-reactivenav2d/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, dynamic-reconfigure, actionlib-msgs, tf, catkin, mrpt1, visualization-msgs, actionlib, mrpt-bridge, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, mrpt-bridge, actionlib-msgs, tf, catkin, mrpt1, visualization-msgs, actionlib, dynamic-reconfigure, roscpp, geometry-msgs }: buildRosPackage { pname = "ros-melodic-mrpt-reactivenav2d"; version = "0.1.24"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "9ed18349bd87a33282aebd32c8a56faae62fe5bbb19330f3ba29ffd6c8d2cf31"; }; - buildInputs = [ mrpt-bridge actionlib-msgs tf roscpp mrpt1 actionlib dynamic-reconfigure visualization-msgs geometry-msgs ]; - propagatedBuildInputs = [ mrpt-bridge actionlib-msgs tf roscpp mrpt1 actionlib dynamic-reconfigure visualization-msgs geometry-msgs ]; + buildInputs = [ actionlib-msgs roscpp mrpt1 actionlib visualization-msgs dynamic-reconfigure mrpt-bridge tf geometry-msgs ]; + propagatedBuildInputs = [ actionlib-msgs roscpp mrpt1 actionlib visualization-msgs dynamic-reconfigure mrpt-bridge tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Reactive navigation for 2D robots using MRPT navigation algorithms (TP-Space)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-slam/default.nix b/melodic/mrpt-slam/default.nix index 2a24862e7b..3c0b995453 100644 --- a/melodic/mrpt-slam/default.nix +++ b/melodic/mrpt-slam/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "3170fb5eacbd6bf03b50022ea4c324dd4e147fbcecbee376c4203e52ca004a95"; }; - propagatedBuildInputs = [ mrpt-rbpf-slam mrpt-ekf-slam-3d mrpt-icp-slam-2d mrpt-ekf-slam-2d mrpt-graphslam-2d ]; + propagatedBuildInputs = [ mrpt-icp-slam-2d mrpt-rbpf-slam mrpt-ekf-slam-2d mrpt-ekf-slam-3d mrpt-graphslam-2d ]; nativeBuildInputs = [ catkin ]; meta = { description = ''mrpt_slam''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt-tutorials/default.nix b/melodic/mrpt-tutorials/default.nix index 5422d01e73..117e8f5361 100644 --- a/melodic/mrpt-tutorials/default.nix +++ b/melodic/mrpt-tutorials/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Example files used as tutorials for MRPT ROS packages''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mrpt1/default.nix b/melodic/mrpt1/default.nix index f9b561d78f..2b29a96297 100644 --- a/melodic/mrpt1/default.nix +++ b/melodic/mrpt1/default.nix @@ -2,22 +2,22 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, python, wxGTK, suitesparse, boost, libpcap, catkin, pythonPackages, ffmpeg, assimp, libusb1, octomap, libjpeg, eigen, zlib, freeglut, cmake, opencv3, libudev }: +{ lib, buildRosPackage, fetchurl, wxGTK, suitesparse, libpcap, catkin, ffmpeg, assimp, libusb1, octomap, libjpeg, eigen, zlib, freeglut, cmake, opencv3, libudev }: buildRosPackage { pname = "ros-melodic-mrpt1"; - version = "1.5.7-r7"; + version = "1.5.7-r6"; src = fetchurl { - url = https://github.com/mrpt-ros-pkg-release/mrpt1-release/archive/release/melodic/mrpt1/1.5.7-7.tar.gz; - sha256 = "16a64b1d70cdcd12cf1a716251006efad53b063aee7086999509efcab0c737c8"; + url = https://github.com/mrpt-ros-pkg-release/mrpt1-release/archive/release/melodic/mrpt1/1.5.7-6.tar.gz; + sha256 = "b450ce4344eb9f5015268ff6fa680f25579f1f5bfcc7779d2cd2cfe96f109d7f"; }; - buildInputs = [ python wxGTK pythonPackages.numpy suitesparse boost libpcap assimp ffmpeg libusb1 libjpeg octomap eigen zlib freeglut opencv3 libudev ]; - propagatedBuildInputs = [ python wxGTK pythonPackages.numpy suitesparse boost libpcap catkin assimp ffmpeg libusb1 libjpeg octomap eigen zlib freeglut opencv3 libudev ]; + buildInputs = [ wxGTK suitesparse libpcap assimp ffmpeg libusb1 libjpeg octomap eigen zlib freeglut opencv3 libudev ]; + propagatedBuildInputs = [ wxGTK suitesparse libpcap catkin assimp ffmpeg libusb1 libjpeg octomap eigen zlib freeglut opencv3 libudev ]; nativeBuildInputs = [ cmake ]; meta = { description = ''Mobile Robot Programming Toolkit (MRPT) version 1.5.x''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/multi-interface-roam/default.nix b/melodic/multi-interface-roam/default.nix index 6d90c5949a..0d2bfac0f6 100644 --- a/melodic/multi-interface-roam/default.nix +++ b/melodic/multi-interface-roam/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "2cc32a6b9e3c72f150e3a780951283671bfcd9f2e51e8364f373b9af4f7cf9de"; }; - buildInputs = [ asmach dynamic-reconfigure std-msgs diagnostic-msgs pr2-msgs ieee80211-channels network-monitor-udp rospy ]; - propagatedBuildInputs = [ asmach dynamic-reconfigure std-msgs diagnostic-msgs pr2-msgs ieee80211-channels network-monitor-udp rospy ]; + buildInputs = [ ieee80211-channels network-monitor-udp rospy asmach dynamic-reconfigure std-msgs diagnostic-msgs pr2-msgs ]; + propagatedBuildInputs = [ ieee80211-channels network-monitor-udp rospy asmach dynamic-reconfigure std-msgs diagnostic-msgs pr2-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''sdsdddsdsds''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal lgpl2 gpl1 ]; }; } diff --git a/melodic/multi-map-server/default.nix b/melodic/multi-map-server/default.nix index 577a30634d..684c6dc4da 100644 --- a/melodic/multi-map-server/default.nix +++ b/melodic/multi-map-server/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ map-server rosconsole SDL_image libyamlcpp pythonPackages.pyyaml rosmake roscpp nav-msgs jsk-tools rospy pythonPackages.pillow tf ]; - propagatedBuildInputs = [ map-server nav-msgs rosconsole SDL_image rospy libyamlcpp tf roscpp ]; + propagatedBuildInputs = [ map-server rosconsole SDL_image libyamlcpp roscpp nav-msgs rospy tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''multi_map_server provides the''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/multi-object-tracking-lidar/default.nix b/melodic/multi-object-tracking-lidar/default.nix index a3de4ff91e..d91cb99dc8 100644 --- a/melodic/multi-object-tracking-lidar/default.nix +++ b/melodic/multi-object-tracking-lidar/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "2c8c139caef500a457297233231fcdb913d3106954789481277d4c028df6219f"; }; - buildInputs = [ visualization-msgs pcl-ros pcl sensor-msgs cv-bridge roscpp ]; - propagatedBuildInputs = [ visualization-msgs pcl-ros pcl sensor-msgs cv-bridge roscpp ]; + buildInputs = [ pcl sensor-msgs cv-bridge roscpp pcl-ros visualization-msgs ]; + propagatedBuildInputs = [ pcl sensor-msgs cv-bridge roscpp pcl-ros visualization-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS package for Multiple objects detection, tracking and classification from LIDAR scans/point-clouds''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/multimaster-fkie/default.nix b/melodic/multimaster-fkie/default.nix index 053f32ebd7..d465b232f9 100644 --- a/melodic/multimaster-fkie/default.nix +++ b/melodic/multimaster-fkie/default.nix @@ -5,19 +5,19 @@ { lib, buildRosPackage, fetchurl, master-sync-fkie, default-cfg-fkie, catkin, multimaster-msgs-fkie, node-manager-fkie, master-discovery-fkie }: buildRosPackage { pname = "ros-melodic-multimaster-fkie"; - version = "0.8.10"; + version = "0.8.12"; src = fetchurl { - url = https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/multimaster_fkie/0.8.10-0.tar.gz; - sha256 = "7fa041261a218ef23fc6080700f61994990edfff46ed23e6c945c004965ce500"; + url = https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/multimaster_fkie/0.8.12-0.tar.gz; + sha256 = "1119b4d51db09a0811ca344110f064d21037ada2c8b35f8535b7b6986b996356"; }; - propagatedBuildInputs = [ master-sync-fkie default-cfg-fkie node-manager-fkie master-discovery-fkie multimaster-msgs-fkie ]; + propagatedBuildInputs = [ master-sync-fkie default-cfg-fkie multimaster-msgs-fkie node-manager-fkie master-discovery-fkie ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The metapackage to combine the nodes required to establish and manage a multimaster network. This requires no or minimal configuration. The changes are automatically detected and synchronized.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/multimaster-msgs-fkie/default.nix b/melodic/multimaster-msgs-fkie/default.nix index 19414bb42a..3e7e6fe3fe 100644 --- a/melodic/multimaster-msgs-fkie/default.nix +++ b/melodic/multimaster-msgs-fkie/default.nix @@ -5,11 +5,11 @@ { lib, buildRosPackage, fetchurl, std-msgs, message-generation, catkin, message-runtime }: buildRosPackage { pname = "ros-melodic-multimaster-msgs-fkie"; - version = "0.8.10"; + version = "0.8.12"; src = fetchurl { - url = https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/multimaster_msgs_fkie/0.8.10-0.tar.gz; - sha256 = "eaae4c70fbbfac04d781904e426e516d236eb80b33137ada1ade28eeb2355fc2"; + url = https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/multimaster_msgs_fkie/0.8.12-0.tar.gz; + sha256 = "e69b1c634583d23b9fce4e222c7e4f1728b6849811b9fcb13ef41b0bb26bbc6a"; }; buildInputs = [ std-msgs message-generation ]; @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The messages required by multimaster packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/multires-image/default.nix b/melodic/multires-image/default.nix index ce31284268..f8e3f98815 100644 --- a/melodic/multires-image/default.nix +++ b/melodic/multires-image/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''multires_image''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/multisense-bringup/default.nix b/melodic/multisense-bringup/default.nix index ef7217a302..66dd8daec4 100644 --- a/melodic/multisense-bringup/default.nix +++ b/melodic/multisense-bringup/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''multisense_bringup''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/multisense-cal-check/default.nix b/melodic/multisense-cal-check/default.nix index bea0481b1a..dc7c4773ee 100644 --- a/melodic/multisense-cal-check/default.nix +++ b/melodic/multisense-cal-check/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''multisense_cal_check''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/multisense-description/default.nix b/melodic/multisense-description/default.nix index 7b6f443066..394d197ab3 100644 --- a/melodic/multisense-description/default.nix +++ b/melodic/multisense-description/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''multisense_description''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/multisense-lib/default.nix b/melodic/multisense-lib/default.nix index ad6dd6c274..d8fa503543 100644 --- a/melodic/multisense-lib/default.nix +++ b/melodic/multisense-lib/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''multisense_lib''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/multisense-ros/default.nix b/melodic/multisense-ros/default.nix index 9803dbf589..0de274e487 100644 --- a/melodic/multisense-ros/default.nix +++ b/melodic/multisense-ros/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "c1b2959f4247366b8fffeab9da15990e326707d8abfe4967b16065d6ec3a2af8"; }; - buildInputs = [ image-transport rosbag libjpeg_turbo sensor-msgs cv-bridge genmsg roscpp image-geometry message-generation message-runtime multisense-lib dynamic-reconfigure std-msgs angles tf geometry-msgs stereo-msgs ]; - propagatedBuildInputs = [ image-transport rosbag libjpeg_turbo sensor-msgs cv-bridge genmsg roscpp image-geometry message-generation message-runtime multisense-lib dynamic-reconfigure std-msgs angles tf geometry-msgs stereo-msgs ]; + buildInputs = [ image-transport libjpeg_turbo rosbag sensor-msgs cv-bridge genmsg roscpp image-geometry message-generation message-runtime multisense-lib dynamic-reconfigure std-msgs angles tf geometry-msgs stereo-msgs ]; + propagatedBuildInputs = [ image-transport libjpeg_turbo rosbag sensor-msgs cv-bridge genmsg roscpp image-geometry message-generation message-runtime multisense-lib dynamic-reconfigure std-msgs angles tf geometry-msgs stereo-msgs ]; nativeBuildInputs = [ libyamlcpp catkin ]; meta = { description = ''multisense_ros''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/multisense/default.nix b/melodic/multisense/default.nix index 6bf45eac32..452bfe12a6 100644 --- a/melodic/multisense/default.nix +++ b/melodic/multisense/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "f35a0adbc07dc268fb0740de110b3c45e472843b6dbd90cbd98ae02a867b7f81"; }; - propagatedBuildInputs = [ multisense-bringup multisense-description multisense-ros multisense-lib multisense-cal-check ]; + propagatedBuildInputs = [ multisense-description multisense-ros multisense-cal-check multisense-bringup multisense-lib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''multisense catkin driver''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/mvsim/default.nix b/melodic/mvsim/default.nix index a70ea24e62..c026a41eb5 100644 --- a/melodic/mvsim/default.nix +++ b/melodic/mvsim/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "341d75fa8e654806b77f439a1e82959974366382947ef70df434047c7680adca"; }; - buildInputs = [ sensor-msgs roscpp nav-msgs message-generation message-runtime mrpt1 dynamic-reconfigure std-msgs visualization-msgs mrpt-bridge tf ]; - propagatedBuildInputs = [ sensor-msgs roscpp nav-msgs message-generation message-runtime mrpt1 dynamic-reconfigure std-msgs visualization-msgs mrpt-bridge tf ]; + buildInputs = [ sensor-msgs roscpp message-generation nav-msgs message-runtime mrpt1 dynamic-reconfigure std-msgs visualization-msgs mrpt-bridge tf ]; + propagatedBuildInputs = [ sensor-msgs roscpp message-generation nav-msgs message-runtime mrpt1 dynamic-reconfigure std-msgs visualization-msgs mrpt-bridge tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Node for the "multivehicle simulator" framework.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nanomsg/default.nix b/melodic/nanomsg/default.nix index e119bd7c8c..b32603b6b7 100644 --- a/melodic/nanomsg/default.nix +++ b/melodic/nanomsg/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''The nanomsg package''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/nav-2d-msgs/default.nix b/melodic/nav-2d-msgs/default.nix index cf08c0ed6e..4d2943a3c2 100644 --- a/melodic/nav-2d-msgs/default.nix +++ b/melodic/nav-2d-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Basic message types for two dimensional navigation, extending from geometry_msgs::Pose2D.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nav-2d-utils/default.nix b/melodic/nav-2d-utils/default.nix index 1c8192e64a..2b5366c904 100644 --- a/melodic/nav-2d-utils/default.nix +++ b/melodic/nav-2d-utils/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''A handful of useful utility functions for nav_core2 packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nav-core-adapter/default.nix b/melodic/nav-core-adapter/default.nix index 4b4529f5e9..180e9d6cbe 100644 --- a/melodic/nav-core-adapter/default.nix +++ b/melodic/nav-core-adapter/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, costmap-2d, pluginlib, nav-grid, roslint, tf, nav-core2, catkin, nav-core, nav-2d-msgs, dwb-plugins, dwb-critics, rostest, nav-2d-utils, nav-msgs, visualization-msgs, dwb-local-planner, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, costmap-2d, pluginlib, nav-grid, roslint, nav-core2, catkin, nav-core, nav-2d-msgs, dwb-plugins, dwb-critics, rostest, nav-2d-utils, nav-msgs, visualization-msgs, tf, dwb-local-planner, geometry-msgs }: buildRosPackage { pname = "ros-melodic-nav-core-adapter"; version = "0.2.5-r1"; @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "516bb752f040f0e9f4639d874211c75db1667265e326d1220d3b2f880729a336"; }; - buildInputs = [ costmap-2d pluginlib nav-grid nav-core2 nav-core nav-2d-utils nav-msgs visualization-msgs tf nav-2d-msgs geometry-msgs ]; - checkInputs = [ rostest roslint dwb-local-planner dwb-critics dwb-plugins ]; - propagatedBuildInputs = [ costmap-2d pluginlib nav-grid nav-core2 nav-core nav-2d-utils nav-msgs visualization-msgs tf nav-2d-msgs geometry-msgs ]; + buildInputs = [ costmap-2d pluginlib nav-grid tf nav-core2 nav-core nav-2d-utils nav-msgs visualization-msgs nav-2d-msgs geometry-msgs ]; + checkInputs = [ roslint dwb-critics dwb-plugins rostest dwb-local-planner ]; + propagatedBuildInputs = [ costmap-2d pluginlib nav-grid tf nav-core2 nav-core nav-2d-utils nav-msgs visualization-msgs nav-2d-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package contains adapters for using `nav_core` plugins as `nav_core2` plugins and vice versa (more or less). See README.md for more information.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nav-core/default.nix b/melodic/nav-core/default.nix index f83b9ffcda..1606c93b6d 100644 --- a/melodic/nav-core/default.nix +++ b/melodic/nav-core/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package provides common interfaces for navigation specific robot actions. Currently, this package provides the BaseGlobalPlanner, BaseLocalPlanner, and RecoveryBehavior interfaces, which can be used to build actions that can easily swap their planner, local controller, or recovery behavior for new versions adhering to the same interface.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nav-core2/default.nix b/melodic/nav-core2/default.nix index 246e7d04e8..87dbf30703 100644 --- a/melodic/nav-core2/default.nix +++ b/melodic/nav-core2/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Interfaces for Costmap, LocalPlanner and GlobalPlanner. Replaces nav_core.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nav-grid-iterators/default.nix b/melodic/nav-grid-iterators/default.nix index 3cd8da0f1a..0bd166ed01 100644 --- a/melodic/nav-grid-iterators/default.nix +++ b/melodic/nav-grid-iterators/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "85aa53f153880ee681412a6d1a963547b6110879d69db3fe24842cd9bcbd0200"; }; - buildInputs = [ nav-2d-utils nav-msgs nav-grid roscpp nav-2d-msgs ]; + buildInputs = [ nav-grid nav-2d-utils nav-msgs roscpp nav-2d-msgs ]; checkInputs = [ rosunit roslint ]; - propagatedBuildInputs = [ nav-2d-utils nav-msgs nav-grid roscpp nav-2d-msgs ]; + propagatedBuildInputs = [ nav-grid nav-2d-utils nav-msgs roscpp nav-2d-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Iterator implementations for moving around the cells of a nav_grid in a number of common patterns.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nav-grid-pub-sub/default.nix b/melodic/nav-grid-pub-sub/default.nix index 9096854b7d..f1afc9f785 100644 --- a/melodic/nav-grid-pub-sub/default.nix +++ b/melodic/nav-grid-pub-sub/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Publishers and Subscribers for nav_grid data.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nav-grid/default.nix b/melodic/nav-grid/default.nix index 7ca0b89e45..8a4a2f0ef7 100644 --- a/melodic/nav-grid/default.nix +++ b/melodic/nav-grid/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A templatized interface for overlaying a two dimensional grid on the world.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nav-msgs/default.nix b/melodic/nav-msgs/default.nix index a3915a64b3..579a381bd5 100644 --- a/melodic/nav-msgs/default.nix +++ b/melodic/nav-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''nav_msgs defines the common messages used to interact with the navigation stack.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nav2d-exploration/default.nix b/melodic/nav2d-exploration/default.nix index fd1c91ff41..335e63a8f9 100644 --- a/melodic/nav2d-exploration/default.nix +++ b/melodic/nav2d-exploration/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "a66a917dec44f5f164671346050a6c578e51625a1afc22e100a4f2e40758e8af"; }; - buildInputs = [ nav-msgs nav2d-navigator pluginlib visualization-msgs tf roscpp geometry-msgs ]; - propagatedBuildInputs = [ nav-msgs nav2d-navigator pluginlib visualization-msgs tf roscpp geometry-msgs ]; + buildInputs = [ nav2d-navigator pluginlib tf nav-msgs visualization-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ nav2d-navigator pluginlib tf nav-msgs visualization-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package holds a collection of plugins for the RobotNavigator, that provide different cooperative exploration strategies for a team of mobile robots.''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 ]; }; } diff --git a/melodic/nav2d-karto/default.nix b/melodic/nav2d-karto/default.nix index 366f8e08cf..2addf52eac 100644 --- a/melodic/nav2d-karto/default.nix +++ b/melodic/nav2d-karto/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "43cc5478e64f5499139be34e4cdc8015fa3ca70d03bd49134c85b83e6934b0a2"; }; - buildInputs = [ suitesparse nav2d-msgs tf roscpp tbb nav2d-localizer nav-msgs eigen visualization-msgs geometry-msgs ]; - propagatedBuildInputs = [ suitesparse nav2d-msgs tf roscpp tbb nav2d-localizer nav-msgs eigen visualization-msgs geometry-msgs ]; + buildInputs = [ suitesparse nav2d-msgs tf nav2d-localizer tbb nav-msgs visualization-msgs eigen roscpp geometry-msgs ]; + propagatedBuildInputs = [ suitesparse nav2d-msgs tf nav2d-localizer tbb nav-msgs visualization-msgs eigen roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Graph-based Simultaneous Localization and Mapping module. Includes OpenKarto GraphSLAM library by "SRI International".''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 ]; }; } diff --git a/melodic/nav2d-localizer/default.nix b/melodic/nav2d-localizer/default.nix index fb65062e36..eae1afc43d 100644 --- a/melodic/nav2d-localizer/default.nix +++ b/melodic/nav2d-localizer/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "208e7b94f3e9a0f384f7de704056d90747e8df288e7dd48650fd1ec1b3125b98"; }; - buildInputs = [ nav-msgs geometry-msgs sensor-msgs tf roscpp ]; - propagatedBuildInputs = [ nav-msgs geometry-msgs sensor-msgs tf roscpp ]; + buildInputs = [ sensor-msgs roscpp nav-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs roscpp nav-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Wrapper around Particle Filter implementation. The SelfLocalizer can be used as library or as a ros-node.''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 ]; }; } diff --git a/melodic/nav2d-msgs/default.nix b/melodic/nav2d-msgs/default.nix index d27cc7a7c4..1c12280ef5 100644 --- a/melodic/nav2d-msgs/default.nix +++ b/melodic/nav2d-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages used for 2D-Navigation.''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 ]; }; } diff --git a/melodic/nav2d-navigator/default.nix b/melodic/nav2d-navigator/default.nix index cae5a9e9ca..25a06918a1 100644 --- a/melodic/nav2d-navigator/default.nix +++ b/melodic/nav2d-navigator/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, std-srvs, pluginlib, actionlib-msgs, nav2d-operator, nav2d-msgs, catkin, roscpp, message-generation, message-runtime, actionlib, tf, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, std-srvs, pluginlib, actionlib-msgs, nav2d-operator, nav2d-msgs, tf, catkin, message-generation, message-runtime, actionlib, roscpp, geometry-msgs }: buildRosPackage { pname = "ros-melodic-nav2d-navigator"; version = "0.4.2"; @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "d2f314f6da94486aaa5a19d27aa7c1a598950b95287b37a494359ba2911881aa"; }; - buildInputs = [ std-srvs pluginlib actionlib-msgs nav2d-operator nav2d-msgs roscpp message-generation actionlib tf geometry-msgs ]; - propagatedBuildInputs = [ std-srvs pluginlib actionlib-msgs nav2d-operator nav2d-msgs roscpp message-runtime actionlib tf geometry-msgs ]; + buildInputs = [ std-srvs pluginlib actionlib-msgs nav2d-operator nav2d-msgs tf message-generation actionlib roscpp geometry-msgs ]; + propagatedBuildInputs = [ std-srvs pluginlib actionlib-msgs nav2d-operator tf nav2d-msgs message-runtime actionlib roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { within this map to create a plan for navigation. When used together with a SLAM module it can also be used to perform autonomous exploration of the robot's workspace.''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 ]; }; } diff --git a/melodic/nav2d-operator/default.nix b/melodic/nav2d-operator/default.nix index d2e4477edc..1f77137629 100644 --- a/melodic/nav2d-operator/default.nix +++ b/melodic/nav2d-operator/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "a8ba977c06ec3334210448ff31687a876686fe661f3b50f407471465c81faccd"; }; - buildInputs = [ costmap-2d message-generation tf2-ros sensor-msgs tf roscpp ]; - propagatedBuildInputs = [ costmap-2d message-runtime sensor-msgs tf roscpp ]; + buildInputs = [ costmap-2d sensor-msgs roscpp tf2-ros message-generation tf ]; + propagatedBuildInputs = [ costmap-2d sensor-msgs roscpp message-runtime tf ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { works by evaluating a set of predefined motion primitives based on a local costmap and a desired direction. The best evaluated motion command will be send to the mobile base.''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 ]; }; } diff --git a/melodic/nav2d-remote/default.nix b/melodic/nav2d-remote/default.nix index 6343bb5b16..049f818b27 100644 --- a/melodic/nav2d-remote/default.nix +++ b/melodic/nav2d-remote/default.nix @@ -21,6 +21,6 @@ buildRosPackage { navigator node from navigation_2d. Currently there is one node to control one robot with a joystick and one to control multiple robots in simulation. It can send commands directly to the operator or start and stop navigator actions.''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 ]; }; } diff --git a/melodic/nav2d-tutorials/default.nix b/melodic/nav2d-tutorials/default.nix index 956401bc91..b5d8dc0b43 100644 --- a/melodic/nav2d-tutorials/default.nix +++ b/melodic/nav2d-tutorials/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "ae60ec866cca40ba8cd6f96181b3dfed1bde5cac12dd9813260a77837e078b3b"; }; - propagatedBuildInputs = [ nav2d-localizer nav2d-navigator nav2d-remote nav2d-karto nav2d-operator nav2d-msgs nav2d-exploration ]; + propagatedBuildInputs = [ nav2d-navigator nav2d-remote nav2d-karto nav2d-operator nav2d-msgs nav2d-exploration nav2d-localizer ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Contains a set of tutorials that run 2D-Navigation within Stage-Simulator.''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 ]; }; } diff --git a/melodic/nav2d/default.nix b/melodic/nav2d/default.nix index ed10839cff..1623db36ed 100644 --- a/melodic/nav2d/default.nix +++ b/melodic/nav2d/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "290981964bfb9d4a38651fa57f321fe5b777363ac3e0b6f8dc0fd69ba4ec0a6b"; }; - propagatedBuildInputs = [ nav2d-localizer nav2d-navigator nav2d-remote nav2d-karto nav2d-operator nav2d-tutorials nav2d-msgs nav2d-exploration ]; + propagatedBuildInputs = [ nav2d-navigator nav2d-remote nav2d-karto nav2d-operator nav2d-tutorials nav2d-msgs nav2d-exploration nav2d-localizer ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Meta-Package containing modules for 2D-Navigation''; - #license = lib.licenses.GPLv3; + license = with lib.licenses; [ gpl3 ]; }; } diff --git a/melodic/navfn/default.nix b/melodic/navfn/default.nix index 3ca34a5bcd..65b325ea7f 100644 --- a/melodic/navfn/default.nix +++ b/melodic/navfn/default.nix @@ -14,7 +14,7 @@ buildRosPackage { buildInputs = [ costmap-2d rosconsole pluginlib cmake-modules sensor-msgs nav-core tf2-ros roscpp nav-msgs message-generation visualization-msgs netpbm geometry-msgs ]; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ costmap-2d rosconsole pluginlib nav-core sensor-msgs roscpp tf2-ros nav-msgs message-runtime visualization-msgs geometry-msgs ]; + propagatedBuildInputs = [ costmap-2d rosconsole pluginlib sensor-msgs nav-core tf2-ros nav-msgs message-runtime visualization-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { @@ -24,6 +24,6 @@ buildRosPackage { computed with Dijkstra's algorithm, but support for an A* heuristic may also be added in the near future. navfn also provides a ROS wrapper for the navfn planner that adheres to the nav_core::BaseGlobalPlanner interface specified in nav_core.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/navigation-experimental/default.nix b/melodic/navigation-experimental/default.nix index 08d2b6be6e..7ea440a061 100644 --- a/melodic/navigation-experimental/default.nix +++ b/melodic/navigation-experimental/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, assisted-teleop, catkin, sbpl-lattice-planner, pose-follower, goal-passer, twist-recovery, pose-base-controller, sbpl-recovery }: +{ lib, buildRosPackage, fetchurl, pose-base-controller, catkin, sbpl-lattice-planner, pose-follower, goal-passer, twist-recovery, assisted-teleop, sbpl-recovery }: buildRosPackage { pname = "ros-melodic-navigation-experimental"; version = "0.3.2"; @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "79834c6c9f70411161eb2604ba1e6b13ecd2d28c89eeefd583530f237a8f851f"; }; - propagatedBuildInputs = [ sbpl-lattice-planner pose-follower assisted-teleop goal-passer twist-recovery pose-base-controller sbpl-recovery ]; + propagatedBuildInputs = [ assisted-teleop sbpl-lattice-planner pose-follower goal-passer twist-recovery pose-base-controller sbpl-recovery ]; nativeBuildInputs = [ catkin ]; meta = { @@ -20,6 +20,6 @@ buildRosPackage { local and global planner plugins for move_base, a teleop filter for obstacle avoidance, a simple control-based move_base replacement etc.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/navigation-layers/default.nix b/melodic/navigation-layers/default.nix index c11914f09c..fe3b2348fe 100644 --- a/melodic/navigation-layers/default.nix +++ b/melodic/navigation-layers/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Extra navigation layers.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/navigation/default.nix b/melodic/navigation/default.nix index 5dede8191e..b2daf5da9f 100644 --- a/melodic/navigation/default.nix +++ b/melodic/navigation/default.nix @@ -19,6 +19,6 @@ buildRosPackage { description = ''A 2D navigation stack that takes in information from odometry, sensor streams, and a goal pose and outputs safe velocity commands that are sent to a mobile base.''; - #license = lib.licenses.BSD,LGPL,LGPL (amcl); + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/neobotix-usboard-msgs/default.nix b/melodic/neobotix-usboard-msgs/default.nix index 41e1399f41..9e0a09b20e 100644 --- a/melodic/neobotix-usboard-msgs/default.nix +++ b/melodic/neobotix-usboard-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''neobotix_usboard package''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/neonavigation-msgs/default.nix b/melodic/neonavigation-msgs/default.nix index bcb954df13..a1f12320cb 100644 --- a/melodic/neonavigation-msgs/default.nix +++ b/melodic/neonavigation-msgs/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Message definitions for neonavigation package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/neonavigation-rviz-plugins/default.nix b/melodic/neonavigation-rviz-plugins/default.nix index addb9aa073..bf8b2ccb67 100644 --- a/melodic/neonavigation-rviz-plugins/default.nix +++ b/melodic/neonavigation-rviz-plugins/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Rviz plugins for neonavigation package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nerian-stereo/default.nix b/melodic/nerian-stereo/default.nix index e5e435becf..560de67553 100644 --- a/melodic/nerian-stereo/default.nix +++ b/melodic/nerian-stereo/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "cab332138682cb2a2fb8de01086a05bf0c8e7a81c2ad1f169e7b5304968539ca"; }; - buildInputs = [ message-generation boost std-msgs sensor-msgs cv-bridge roscpp ]; - propagatedBuildInputs = [ cv-bridge boost curl message-runtime std-msgs sensor-msgs roscpp ]; + buildInputs = [ boost sensor-msgs cv-bridge message-generation std-msgs roscpp ]; + propagatedBuildInputs = [ boost sensor-msgs cv-bridge curl message-runtime std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Driver node for SceneScan and SP1 stereo vision sensors by Nerian Vision Technologies''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/network-control-tests/default.nix b/melodic/network-control-tests/default.nix index 101266d145..ade0a6afa5 100644 --- a/melodic/network-control-tests/default.nix +++ b/melodic/network-control-tests/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "277a453251b08e5d8616c7c1af2081b1f9a5fde81c7415b7eb5eac329e1aefb6"; }; - buildInputs = [ rostest network-traffic-control access-point-control dynamic-reconfigure ddwrt-access-point hostapd-access-point network-monitor-udp linksys-access-point ]; - propagatedBuildInputs = [ rostest network-traffic-control access-point-control dynamic-reconfigure ddwrt-access-point hostapd-access-point network-monitor-udp linksys-access-point ]; + buildInputs = [ access-point-control hostapd-access-point network-monitor-udp linksys-access-point rostest network-traffic-control dynamic-reconfigure ddwrt-access-point ]; + propagatedBuildInputs = [ access-point-control hostapd-access-point network-monitor-udp linksys-access-point rostest network-traffic-control dynamic-reconfigure ddwrt-access-point ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Test suite for the packages that are part of the "WiFi Test Setup" project: network_monitor_udp, network_traffic_control, hostapd_access_point, linksys_access_point, ddwrt_access_point.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/network-detector/default.nix b/melodic/network-detector/default.nix index 09d5598ea2..d3cdeb0550 100644 --- a/melodic/network-detector/default.nix +++ b/melodic/network-detector/default.nix @@ -21,6 +21,6 @@ buildRosPackage { whether it is both UP and RUNNING (indicating that a cable is plugged into it and communication is happening, for instance) or not.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/network-interface/default.nix b/melodic/network-interface/default.nix index 4ef2167621..f2c116dd59 100644 --- a/melodic/network-interface/default.nix +++ b/melodic/network-interface/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Network interfaces and messages.''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/network-monitor-udp/default.nix b/melodic/network-monitor-udp/default.nix index be4ba0b8f0..707acd145a 100644 --- a/melodic/network-monitor-udp/default.nix +++ b/melodic/network-monitor-udp/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "d203956bc49ba42bf2f54ef0cb57253ec42fd8278260bd5090fd998765198154"; }; - buildInputs = [ message-generation actionlib-msgs actionlib rospy diagnostic-msgs ]; - propagatedBuildInputs = [ message-runtime actionlib-msgs actionlib diagnostic-msgs rospy ]; + buildInputs = [ actionlib-msgs rospy message-generation actionlib diagnostic-msgs ]; + propagatedBuildInputs = [ actionlib-msgs rospy message-runtime actionlib diagnostic-msgs ]; nativeBuildInputs = [ catkin ]; meta = { @@ -21,6 +21,6 @@ buildRosPackage { a client to a server, which bounces them back to the client. The client collects statistics on latency and loss. The server is a C standalone utility or a ROS node. The client can be a ROS node, a standalone utility or a python class.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/network-traffic-control/default.nix b/melodic/network-traffic-control/default.nix index 0499ffc77f..d062cd6de8 100644 --- a/melodic/network-traffic-control/default.nix +++ b/melodic/network-traffic-control/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''A ROS node that allows control of network emulation parameters such as bandwidth, loss and latency for a Linux network interface.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nlopt/default.nix b/melodic/nlopt/default.nix index d1426c74af..c7f17aa5be 100644 --- a/melodic/nlopt/default.nix +++ b/melodic/nlopt/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''nlopt''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nmea-msgs/default.nix b/melodic/nmea-msgs/default.nix index d55881ca80..f711bd5a81 100644 --- a/melodic/nmea-msgs/default.nix +++ b/melodic/nmea-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The nmea_msgs package contains messages related to data in the NMEA format.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nmea-navsat-driver/default.nix b/melodic/nmea-navsat-driver/default.nix index 9f0cabe5a0..32b678c446 100644 --- a/melodic/nmea-navsat-driver/default.nix +++ b/melodic/nmea-navsat-driver/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, roslint, geometry-msgs, sensor-msgs, catkin, pythonPackages, rospy, nmea-msgs }: +{ lib, buildRosPackage, fetchurl, roslint, sensor-msgs, catkin, pythonPackages, nmea-msgs, rospy, geometry-msgs }: buildRosPackage { pname = "ros-melodic-nmea-navsat-driver"; version = "0.5.1"; @@ -13,12 +13,12 @@ buildRosPackage { }; checkInputs = [ roslint ]; - propagatedBuildInputs = [ pythonPackages.pyserial rospy sensor-msgs geometry-msgs nmea-msgs ]; + propagatedBuildInputs = [ pythonPackages.pyserial sensor-msgs nmea-msgs rospy geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Package to parse NMEA strings and publish a very simple GPS message. Does not require or use the GPSD deamon.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/node-manager-fkie/default.nix b/melodic/node-manager-fkie/default.nix index c9b776baef..cd9be101db 100644 --- a/melodic/node-manager-fkie/default.nix +++ b/melodic/node-manager-fkie/default.nix @@ -5,21 +5,21 @@ { lib, buildRosPackage, fetchurl, default-cfg-fkie, rqt-gui, rosservice, screen, rosgraph, rospy, diagnostic-msgs, pythonPackages, rqt-reconfigure, xterm, roslaunch, roslib, master-sync-fkie, rosmsg, catkin, python-qt-binding, multimaster-msgs-fkie, dynamic-reconfigure, master-discovery-fkie }: buildRosPackage { pname = "ros-melodic-node-manager-fkie"; - version = "0.8.10"; + version = "0.8.12"; src = fetchurl { - url = https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/node_manager_fkie/0.8.10-0.tar.gz; - sha256 = "f1fcdc8979b5f7b35450e6db900c488adc683cef8abea3d06dbfb4070498f598"; + url = https://github.com/fkie-release/multimaster_fkie-release/archive/release/melodic/node_manager_fkie/0.8.12-0.tar.gz; + sha256 = "6b4d7ed02437aa8bb4675c90822d4215267b78598d7125b49bf6b0f1b584cef0"; }; buildInputs = [ diagnostic-msgs multimaster-msgs-fkie master-discovery-fkie ]; - propagatedBuildInputs = [ master-sync-fkie default-cfg-fkie rqt-gui rosmsg rosservice screen rosgraph rospy pythonPackages.paramiko diagnostic-msgs python-qt-binding pythonPackages.docutils multimaster-msgs-fkie rqt-reconfigure xterm dynamic-reconfigure master-discovery-fkie roslaunch roslib ]; + propagatedBuildInputs = [ default-cfg-fkie rqt-gui rosservice screen rosgraph rospy pythonPackages.paramiko diagnostic-msgs pythonPackages.docutils rqt-reconfigure xterm roslaunch roslib master-sync-fkie rosmsg python-qt-binding multimaster-msgs-fkie dynamic-reconfigure master-discovery-fkie ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Graphical interface, written in PySide, to manage the running and configured ROS nodes on different hosts. For discovering the running ROS master master_discovery node will be used.''; - #license = lib.licenses.BSD, some icons are licensed under the GNU Lesser General Public License (LGPL) or Creative Commons Attribution-Noncommercial 3.0 License; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nodelet-core/default.nix b/melodic/nodelet-core/default.nix index 210d910aff..0a81c2ee45 100644 --- a/melodic/nodelet-core/default.nix +++ b/melodic/nodelet-core/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Nodelet Core Metapackage''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nodelet-topic-tools/default.nix b/melodic/nodelet-topic-tools/default.nix index f1972c4988..5f9a026afd 100644 --- a/melodic/nodelet-topic-tools/default.nix +++ b/melodic/nodelet-topic-tools/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ boost dynamic-reconfigure ]; - propagatedBuildInputs = [ pluginlib boost dynamic-reconfigure nodelet roscpp message-filters ]; + propagatedBuildInputs = [ pluginlib boost message-filters nodelet dynamic-reconfigure roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package contains common nodelet tools such as a mux, demux and throttle.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nodelet-tutorial-math/default.nix b/melodic/nodelet-tutorial-math/default.nix index 1e83872d8e..1f36098eeb 100644 --- a/melodic/nodelet-tutorial-math/default.nix +++ b/melodic/nodelet-tutorial-math/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Package for Nodelet tutorial.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/nodelet/default.nix b/melodic/nodelet/default.nix index 3dd8821a43..cba2cd72b7 100644 --- a/melodic/nodelet/default.nix +++ b/melodic/nodelet/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "3a9e9701df570659d70f871eb7e1970dacd3b89c02513c456f8f0ea1a446d15a"; }; - buildInputs = [ rosconsole pluginlib boost cmake-modules bondcpp message-generation std-msgs roscpp utillinux ]; + buildInputs = [ rosconsole pluginlib boost bondcpp cmake-modules message-generation std-msgs roscpp utillinux ]; propagatedBuildInputs = [ rosconsole pluginlib boost bondcpp message-runtime rospy std-msgs roscpp utillinux ]; nativeBuildInputs = [ catkin ]; @@ -24,6 +24,6 @@ buildRosPackage { This package provides both the nodelet base class needed for implementing a nodelet, as well as the NodeletLoader class used for instantiating nodelets.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/novatel-gps-driver/default.nix b/melodic/novatel-gps-driver/default.nix index 40dfd04293..62433c340f 100644 --- a/melodic/novatel-gps-driver/default.nix +++ b/melodic/novatel-gps-driver/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Driver for NovAtel receivers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/novatel-gps-msgs/default.nix b/melodic/novatel-gps-msgs/default.nix index 975a32a9af..3db9abfee5 100644 --- a/melodic/novatel-gps-msgs/default.nix +++ b/melodic/novatel-gps-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages for proprietary (non-NMEA) sentences from Novatel GPS receivers.''; - #license = lib.licenses.Southwest Research Institute Proprietary; + license = with lib.licenses; [ "Southwest Research Institute Proprietary" ]; }; } diff --git a/melodic/novatel-msgs/default.nix b/melodic/novatel-msgs/default.nix index 2f40dd0b6e..58cc942538 100644 --- a/melodic/novatel-msgs/default.nix +++ b/melodic/novatel-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS messages which represent raw Novatel SPAN data.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/object-recognition-msgs/default.nix b/melodic/object-recognition-msgs/default.nix index 1ade424bd0..110a1f7a24 100644 --- a/melodic/object-recognition-msgs/default.nix +++ b/melodic/object-recognition-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "0d4a39404ca6ce3fe26eb6a00df0edf208a58651c7605d42f20c9c6a2df9be72"; }; - buildInputs = [ shape-msgs message-generation actionlib-msgs std-msgs sensor-msgs geometry-msgs ]; - propagatedBuildInputs = [ shape-msgs message-runtime actionlib-msgs std-msgs sensor-msgs geometry-msgs ]; + buildInputs = [ shape-msgs actionlib-msgs sensor-msgs message-generation std-msgs geometry-msgs ]; + propagatedBuildInputs = [ shape-msgs actionlib-msgs sensor-msgs message-runtime std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Object_recognition_msgs contains the ROS message and the actionlib definition used in object_recognition_core''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ocean-battery-driver/default.nix b/melodic/ocean-battery-driver/default.nix index 08f6b1b6a1..47c0947778 100644 --- a/melodic/ocean-battery-driver/default.nix +++ b/melodic/ocean-battery-driver/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This is an interface to the Ocean Server Technology Intelligent Battery and Power System.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/octomap-mapping/default.nix b/melodic/octomap-mapping/default.nix index 1fcb1da37f..f547b0df31 100644 --- a/melodic/octomap-mapping/default.nix +++ b/melodic/octomap-mapping/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Mapping tools to be used with the OctoMap library, implementing a 3D occupancy grid mapping.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/octomap-msgs/default.nix b/melodic/octomap-msgs/default.nix index cc5e127f48..eafded2b1c 100644 --- a/melodic/octomap-msgs/default.nix +++ b/melodic/octomap-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package provides messages and serializations / conversion for the OctoMap library.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/octomap-ros/default.nix b/melodic/octomap-ros/default.nix index 7821923076..d6ee3515f5 100644 --- a/melodic/octomap-ros/default.nix +++ b/melodic/octomap-ros/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "50dca555a5c7883b74068ae676db17671fa15da854f2985ed4999feff70089fd"; }; - buildInputs = [ octomap tf sensor-msgs catkin octomap-msgs ]; + buildInputs = [ sensor-msgs catkin octomap-msgs octomap tf ]; propagatedBuildInputs = [ sensor-msgs tf octomap octomap-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''octomap_ros provides conversion functions between ROS and OctoMap's native types. This enables a convenvient use of the octomap package in ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/octomap-server/default.nix b/melodic/octomap-server/default.nix index fba557e21a..6ba1c99ff1 100644 --- a/melodic/octomap-server/default.nix +++ b/melodic/octomap-server/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''octomap_server loads a 3D map (as Octree-based OctoMap) and distributes it to other nodes in a compact binary format. It also allows to incrementally build 3D OctoMaps, and provides map saving in the node octomap_saver.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/octomap/default.nix b/melodic/octomap/default.nix index e3affab207..ebade042bc 100644 --- a/melodic/octomap/default.nix +++ b/melodic/octomap/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The OctoMap library implements a 3D occupancy grid mapping approach, providing data structures and mapping algorithms in C++. The map implementation is based on an octree. See http://octomap.github.io for details.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/octovis/default.nix b/melodic/octovis/default.nix index 2cf555db9e..d9f5748025 100644 --- a/melodic/octovis/default.nix +++ b/melodic/octovis/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''octovis is visualization tool for the OctoMap library based on Qt and libQGLViewer. See http://octomap.github.io for details.''; - #license = lib.licenses.GPLv2; + license = with lib.licenses; [ gpl2 ]; }; } diff --git a/melodic/odva-ethernetip/default.nix b/melodic/odva-ethernetip/default.nix index e98792d6ac..7ea7f68863 100644 --- a/melodic/odva-ethernetip/default.nix +++ b/melodic/odva-ethernetip/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Library implementing ODVA EtherNet/IP (Industrial Protocol).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ompl/default.nix b/melodic/ompl/default.nix index 2da6bb4d06..94f610918f 100644 --- a/melodic/ompl/default.nix +++ b/melodic/ompl/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''OMPL is a free sampling-based motion planning library.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/omron-os32c-driver/default.nix b/melodic/omron-os32c-driver/default.nix index 3a9aebf21c..571b8160c2 100644 --- a/melodic/omron-os32c-driver/default.nix +++ b/melodic/omron-os32c-driver/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "ebf659a3b4a959dc4c76afcd198ebcb73f574772b9af68d3279965d14a3369b8"; }; - buildInputs = [ diagnostic-updater odva-ethernetip boost sensor-msgs roscpp rosconsole-bridge ]; + buildInputs = [ boost sensor-msgs rosconsole-bridge diagnostic-updater odva-ethernetip roscpp ]; checkInputs = [ roslaunch rosunit ]; - propagatedBuildInputs = [ diagnostic-updater odva-ethernetip boost sensor-msgs roscpp rosconsole-bridge ]; + propagatedBuildInputs = [ boost sensor-msgs rosconsole-bridge diagnostic-updater odva-ethernetip roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Interface driver for Omron OS32C Lidar via Ethernet/IP (Industrial Protocol)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/open-karto/default.nix b/melodic/open-karto/default.nix index c0f2f1b08c..6413b4197f 100644 --- a/melodic/open-karto/default.nix +++ b/melodic/open-karto/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Catkinized ROS packaging of the OpenKarto library''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/open-manipulator-control-gui/default.nix b/melodic/open-manipulator-control-gui/default.nix index a95d4e7f6c..3b2852ec64 100644 --- a/melodic/open-manipulator-control-gui/default.nix +++ b/melodic/open-manipulator-control-gui/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "e4dc03e16d77a2295b53e586737453f552dc2b256e064bf784c592fe58cca2cd"; }; - buildInputs = [ cmake-modules open-manipulator-msgs eigen std-msgs sensor-msgs roscpp qt5.qtbase ]; - propagatedBuildInputs = [ cmake-modules open-manipulator-msgs eigen std-msgs sensor-msgs roscpp qt5.qtbase ]; + buildInputs = [ cmake-modules sensor-msgs qt5.qtbase eigen std-msgs roscpp open-manipulator-msgs ]; + propagatedBuildInputs = [ cmake-modules sensor-msgs qt5.qtbase eigen std-msgs roscpp open-manipulator-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''OpenManipulator GUI control package based on QT''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-controller/default.nix b/melodic/open-manipulator-controller/default.nix index 8b83c0dd13..6a578c13e0 100644 --- a/melodic/open-manipulator-controller/default.nix +++ b/melodic/open-manipulator-controller/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''OpenManipulator controller package''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-description/default.nix b/melodic/open-manipulator-description/default.nix index 6f7cf7bc5b..a3fc5d6ef9 100644 --- a/melodic/open-manipulator-description/default.nix +++ b/melodic/open-manipulator-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''OpenManipulator 3D model description for visualization and simulation''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-gazebo/default.nix b/melodic/open-manipulator-gazebo/default.nix index 0b5c2b67e3..31ce374f81 100644 --- a/melodic/open-manipulator-gazebo/default.nix +++ b/melodic/open-manipulator-gazebo/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Gazebo configurations package for OpenManipulator''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-libs/default.nix b/melodic/open-manipulator-libs/default.nix index 09ad163476..0c6b087f06 100644 --- a/melodic/open-manipulator-libs/default.nix +++ b/melodic/open-manipulator-libs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "1e026abdb7af7fe42518d35f418754921f3231a328794e8eba9d10ab1bea3b63"; }; - buildInputs = [ dynamixel-workbench-toolbox cmake-modules eigen roscpp robotis-manipulator ]; - propagatedBuildInputs = [ dynamixel-workbench-toolbox cmake-modules eigen roscpp robotis-manipulator ]; + buildInputs = [ cmake-modules robotis-manipulator dynamixel-workbench-toolbox eigen roscpp ]; + propagatedBuildInputs = [ cmake-modules robotis-manipulator dynamixel-workbench-toolbox eigen roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''OpenManipulator library (Kinematics lib., Dynamixel lib., Drawing path lib.)''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-moveit/default.nix b/melodic/open-manipulator-moveit/default.nix index 6b7d9ee071..2a087c9e1f 100644 --- a/melodic/open-manipulator-moveit/default.nix +++ b/melodic/open-manipulator-moveit/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''An automatically generated package with all the configuration and launch files for using the open_manipulator with the MoveIt! Motion Planning Framework''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-msgs/default.nix b/melodic/open-manipulator-msgs/default.nix index be9161db71..887d9424d2 100644 --- a/melodic/open-manipulator-msgs/default.nix +++ b/melodic/open-manipulator-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages and services package for OpenManipulator to send information about state or pose''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-simulations/default.nix b/melodic/open-manipulator-simulations/default.nix index e047fa43f7..db61f6346c 100644 --- a/melodic/open-manipulator-simulations/default.nix +++ b/melodic/open-manipulator-simulations/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Simulation packages for OpenManipulator''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-teleop/default.nix b/melodic/open-manipulator-teleop/default.nix index 4dc8ae6ad3..7b2c6f28a6 100644 --- a/melodic/open-manipulator-teleop/default.nix +++ b/melodic/open-manipulator-teleop/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Provides teleoperation using keyboard for OpenManipulator.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-with-tb3-description/default.nix b/melodic/open-manipulator-with-tb3-description/default.nix index d0159603cd..fcef615cb2 100644 --- a/melodic/open-manipulator-with-tb3-description/default.nix +++ b/melodic/open-manipulator-with-tb3-description/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''OpenManipulator 3D model description for visualization and simulation''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-with-tb3-gazebo/default.nix b/melodic/open-manipulator-with-tb3-gazebo/default.nix index c1a1dce013..cff1bfede8 100644 --- a/melodic/open-manipulator-with-tb3-gazebo/default.nix +++ b/melodic/open-manipulator-with-tb3-gazebo/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Simulation package using gazebo for OpenManipulator with TurtleBot3''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-with-tb3-simulations/default.nix b/melodic/open-manipulator-with-tb3-simulations/default.nix index 41c7fbd9e4..0facb9d711 100644 --- a/melodic/open-manipulator-with-tb3-simulations/default.nix +++ b/melodic/open-manipulator-with-tb3-simulations/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Simulation packages for OpenManipulator with TurtleBot3''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-with-tb3-tools/default.nix b/melodic/open-manipulator-with-tb3-tools/default.nix index ad8854440f..04ea625936 100644 --- a/melodic/open-manipulator-with-tb3-tools/default.nix +++ b/melodic/open-manipulator-with-tb3-tools/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ moveit-ros-planning geometry-msgs smach trajectory-msgs smach-ros ar-track-alvar-msgs nav-msgs moveit-core rospy std-msgs moveit-msgs roslaunch roscpp moveit-ros-planning-interface open-manipulator-msgs ]; - propagatedBuildInputs = [ moveit-ros-planning trajectory-msgs smach-ros move-base ar-track-alvar-msgs joint-state-publisher nav-msgs rospy std-msgs moveit-msgs roscpp geometry-msgs map-server amcl moveit-ros-planning-interface moveit-core robot-state-publisher roslaunch smach open-manipulator-msgs ]; + propagatedBuildInputs = [ moveit-ros-planning smach-ros ar-track-alvar-msgs rospy geometry-msgs map-server moveit-core robot-state-publisher roslaunch smach moveit-ros-planning-interface joint-state-publisher trajectory-msgs move-base nav-msgs std-msgs moveit-msgs roscpp amcl open-manipulator-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The tools package(including SLAM, Navigation, Manipulation) for OpenManipulator with TurtleBot3''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-with-tb3-waffle-moveit/default.nix b/melodic/open-manipulator-with-tb3-waffle-moveit/default.nix index 6f5aae2cf5..071df438f0 100644 --- a/melodic/open-manipulator-with-tb3-waffle-moveit/default.nix +++ b/melodic/open-manipulator-with-tb3-waffle-moveit/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, moveit-fake-controller-manager, moveit-ros-move-group, moveit-ros-visualization, moveit-kinematics, open-manipulator-with-tb3-description, catkin, moveit-planners-ompl, robot-state-publisher, joint-state-publisher, xacro, moveit-setup-assistant }: +{ lib, buildRosPackage, fetchurl, moveit-fake-controller-manager, moveit-ros-move-group, moveit-ros-visualization, moveit-kinematics, open-manipulator-with-tb3-description, catkin, moveit-setup-assistant, robot-state-publisher, joint-state-publisher, xacro, moveit-planners-ompl }: buildRosPackage { pname = "ros-melodic-open-manipulator-with-tb3-waffle-moveit"; version = "1.1.0-r2"; @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ open-manipulator-with-tb3-description ]; - propagatedBuildInputs = [ moveit-fake-controller-manager moveit-ros-move-group moveit-ros-visualization moveit-kinematics open-manipulator-with-tb3-description moveit-planners-ompl robot-state-publisher joint-state-publisher xacro moveit-setup-assistant ]; + propagatedBuildInputs = [ moveit-fake-controller-manager moveit-ros-move-group moveit-ros-visualization moveit-kinematics open-manipulator-with-tb3-description moveit-setup-assistant robot-state-publisher joint-state-publisher xacro moveit-planners-ompl ]; nativeBuildInputs = [ catkin ]; meta = { description = ''An automatically generated package with all the configuration and launch files for using the om_with_tb3 with the MoveIt! Motion Planning Framework''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix b/melodic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix index eb77ee423f..900e07669c 100644 --- a/melodic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix +++ b/melodic/open-manipulator-with-tb3-waffle-pi-moveit/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, moveit-fake-controller-manager, moveit-ros-move-group, moveit-ros-visualization, moveit-kinematics, open-manipulator-with-tb3-description, catkin, moveit-planners-ompl, robot-state-publisher, joint-state-publisher, xacro, moveit-setup-assistant }: +{ lib, buildRosPackage, fetchurl, moveit-fake-controller-manager, moveit-ros-move-group, moveit-ros-visualization, moveit-kinematics, open-manipulator-with-tb3-description, catkin, moveit-setup-assistant, robot-state-publisher, joint-state-publisher, xacro, moveit-planners-ompl }: buildRosPackage { pname = "ros-melodic-open-manipulator-with-tb3-waffle-pi-moveit"; version = "1.1.0-r2"; @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ open-manipulator-with-tb3-description ]; - propagatedBuildInputs = [ moveit-fake-controller-manager moveit-ros-move-group moveit-ros-visualization moveit-kinematics open-manipulator-with-tb3-description moveit-planners-ompl robot-state-publisher joint-state-publisher xacro moveit-setup-assistant ]; + propagatedBuildInputs = [ moveit-fake-controller-manager moveit-ros-move-group moveit-ros-visualization moveit-kinematics open-manipulator-with-tb3-description moveit-setup-assistant robot-state-publisher joint-state-publisher xacro moveit-planners-ompl ]; nativeBuildInputs = [ catkin ]; meta = { description = ''An automatically generated package with all the configuration and launch files for using the om_with_tb3 with the MoveIt! Motion Planning Framework''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator-with-tb3/default.nix b/melodic/open-manipulator-with-tb3/default.nix index 7ad37f898e..8a6d0f904b 100644 --- a/melodic/open-manipulator-with-tb3/default.nix +++ b/melodic/open-manipulator-with-tb3/default.nix @@ -19,6 +19,6 @@ buildRosPackage { description = ''ROS-enabled OpenManipulator is a full open robot platform consisting of OpenSoftware​, OpenHardware and OpenCR(Embedded board)​. The OpenManipulator is allowed users to control it more easily by linking with the MoveIt! package. Moreover it has full hardware compatibility with TurtleBot3​. Even if you do not have a real robot, you can control the robot in the Gazebo simulator​.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/open-manipulator/default.nix b/melodic/open-manipulator/default.nix index 5d62bf8f17..b3a45ac70d 100644 --- a/melodic/open-manipulator/default.nix +++ b/melodic/open-manipulator/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, open-manipulator-controller, catkin, open-manipulator-libs, open-manipulator-moveit, open-manipulator-teleop, open-manipulator-control-gui, open-manipulator-description }: +{ lib, buildRosPackage, fetchurl, catkin, open-manipulator-description, open-manipulator-libs, open-manipulator-moveit, open-manipulator-teleop, open-manipulator-control-gui, open-manipulator-controller }: buildRosPackage { pname = "ros-melodic-open-manipulator"; version = "2.0.1"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "8de684b52de5da0e425146ae3a13c0ab79f047544aa163c5b3344b8df2284ea3"; }; - propagatedBuildInputs = [ open-manipulator-libs open-manipulator-moveit open-manipulator-teleop open-manipulator-control-gui open-manipulator-description open-manipulator-controller ]; + propagatedBuildInputs = [ open-manipulator-control-gui open-manipulator-libs open-manipulator-moveit open-manipulator-teleop open-manipulator-description open-manipulator-controller ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS-enabled OpenManipulator is a full open robot platform consisting of OpenSoftware​, OpenHardware and OpenCR(Embedded board)​. The OpenManipulator is allowed users to control it more easily by linking with the MoveIt! package. Moreover it has full hardware compatibility with TurtleBot3​. Even if you do not have a real robot, you can control the robot in the Gazebo simulator​.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/opencv-apps/default.nix b/melodic/opencv-apps/default.nix index ce5d66d410..ccb85d6f33 100644 --- a/melodic/opencv-apps/default.nix +++ b/melodic/opencv-apps/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, cv-bridge, rosservice, image-view, image-transport, message-generation, message-runtime, image-proc, roslaunch, std-srvs, rosbag, catkin, std-msgs, nodelet, roscpp, compressed-image-transport, sensor-msgs, rostest, rostopic, dynamic-reconfigure, topic-tools }: +{ lib, buildRosPackage, fetchurl, cv-bridge, rosservice, image-view, image-transport, message-generation, message-runtime, roslaunch, image-proc, std-srvs, rosbag, catkin, std-msgs, roscpp, nodelet, compressed-image-transport, sensor-msgs, rostest, rostopic, dynamic-reconfigure, topic-tools }: buildRosPackage { pname = "ros-melodic-opencv-apps"; version = "2.0.1-r1"; @@ -12,9 +12,9 @@ buildRosPackage { sha256 = "11489debf5d3b3dc194472f483d67857db62f76665f6785ad4f55882c4e4d3dc"; }; - buildInputs = [ std-srvs image-transport sensor-msgs cv-bridge roscpp message-generation dynamic-reconfigure std-msgs nodelet ]; - checkInputs = [ image-proc rosbag rosservice rostest rostopic image-view topic-tools roslaunch compressed-image-transport ]; - propagatedBuildInputs = [ std-srvs image-transport sensor-msgs cv-bridge roscpp message-runtime dynamic-reconfigure std-msgs nodelet ]; + buildInputs = [ std-srvs image-transport sensor-msgs cv-bridge message-generation nodelet dynamic-reconfigure std-msgs roscpp ]; + checkInputs = [ roslaunch rosbag rosservice rostest rostopic image-view topic-tools image-proc compressed-image-transport ]; + propagatedBuildInputs = [ std-srvs image-transport sensor-msgs cv-bridge message-runtime nodelet dynamic-reconfigure std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { @@ -24,6 +24,6 @@ buildRosPackage {
  • Some of the features covered by opencv_apps are explained in the wiki.

    • The most of code is originally taken from https://github.com/Itseez/opencv/tree/master/samples/cpp

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/openni-description/default.nix b/melodic/openni-description/default.nix index c8378a2d67..bac34d7f24 100644 --- a/melodic/openni-description/default.nix +++ b/melodic/openni-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Model files of OpenNI device.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/openni-launch/default.nix b/melodic/openni-launch/default.nix index 4bb98e4a7d..a43f4615d9 100644 --- a/melodic/openni-launch/default.nix +++ b/melodic/openni-launch/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Launch files to open an OpenNI device and load all nodelets to convert raw depth/RGB/IR streams to depth images, disparity images, and (registered) point clouds.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/openni2-camera/default.nix b/melodic/openni2-camera/default.nix index 6b7e7571e9..9d2dee076c 100644 --- a/melodic/openni2-camera/default.nix +++ b/melodic/openni2-camera/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "d154919dd68c19a6255bbbafd1d238d30baae4e6b146eb17875002511180181f"; }; - buildInputs = [ message-generation dynamic-reconfigure camera-info-manager image-transport sensor-msgs nodelet roscpp openni2 ]; - propagatedBuildInputs = [ message-runtime nodelet dynamic-reconfigure camera-info-manager image-transport sensor-msgs roscpp openni2 ]; + buildInputs = [ camera-info-manager image-transport sensor-msgs roscpp message-generation dynamic-reconfigure nodelet openni2 ]; + propagatedBuildInputs = [ camera-info-manager image-transport sensor-msgs message-runtime nodelet dynamic-reconfigure roscpp openni2 ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Drivers for the Asus Xtion and Primesense Devices. For using a kinect with ROS, try the freenect stack''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/openni2-launch/default.nix b/melodic/openni2-launch/default.nix index a3201ba0e7..9e71f7e070 100644 --- a/melodic/openni2-launch/default.nix +++ b/melodic/openni2-launch/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, roslaunch, openni2-camera, depth-image-proc, roswtf, tf, catkin, pythonPackages, usbutils, rgbd-launch, rospy, image-proc, nodelet }: +{ lib, buildRosPackage, fetchurl, roslaunch, openni2-camera, depth-image-proc, roswtf, catkin, pythonPackages, usbutils, rgbd-launch, rospy, nodelet, image-proc, tf }: buildRosPackage { pname = "ros-melodic-openni2-launch"; version = "0.4.2"; @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ roslaunch pythonPackages.catkin-pkg ]; - propagatedBuildInputs = [ depth-image-proc openni2-camera roswtf tf usbutils rgbd-launch rospy image-proc nodelet ]; + propagatedBuildInputs = [ depth-image-proc openni2-camera roswtf usbutils rgbd-launch rospy nodelet image-proc tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Launch files to start the openni2_camera drivers using rgbd_launch.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/openrtm-aist/default.nix b/melodic/openrtm-aist/default.nix index 8fbf6d4220..f72c6554cb 100644 --- a/melodic/openrtm-aist/default.nix +++ b/melodic/openrtm-aist/default.nix @@ -21,6 +21,6 @@ buildRosPackage {

    OpenRTM-aist is an RT-Middleware-baseed, component-oriented software platform to robotics development that is made and maintained in AIST (National Institute of Advanced Industrial Science and Technology) in Japan (excerpts from here)

    Its development is happening at openrtm.org/pub/OpenRTM-aist. The repository listed below is where the development of its ROS wrapper happening.

    ''; - #license = lib.licenses.EPL; + license = with lib.licenses; [ "EPL" ]; }; } diff --git a/melodic/opt-camera/default.nix b/melodic/opt-camera/default.nix index e2a75d58f7..a496ca5226 100644 --- a/melodic/opt-camera/default.nix +++ b/melodic/opt-camera/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "57af7e6334d1a87c5da35fc6984d7e35906cbb53c0a9d57d8deb7843aafc9505"; }; - buildInputs = [ rospack roslang dynamic-reconfigure camera-calibration-parsers image-proc cv-bridge compressed-image-transport sensor-msgs ]; - propagatedBuildInputs = [ rospack dynamic-reconfigure camera-calibration-parsers image-proc cv-bridge compressed-image-transport sensor-msgs ]; + buildInputs = [ rospack camera-calibration-parsers sensor-msgs cv-bridge roslang dynamic-reconfigure image-proc compressed-image-transport ]; + propagatedBuildInputs = [ rospack camera-calibration-parsers sensor-msgs cv-bridge dynamic-reconfigure image-proc compressed-image-transport ]; nativeBuildInputs = [ catkin ]; meta = { description = ''opt_camera''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/optpp-catkin/default.nix b/melodic/optpp-catkin/default.nix index 394a349e39..db456bc304 100644 --- a/melodic/optpp-catkin/default.nix +++ b/melodic/optpp-catkin/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The OPT++ catkin wrapper package''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/orocos-kdl/default.nix b/melodic/orocos-kdl/default.nix index 577646e34d..5cb5c3e33c 100644 --- a/melodic/orocos-kdl/default.nix +++ b/melodic/orocos-kdl/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package contains a recent version of the Kinematics and Dynamics Library (KDL), distributed by the Orocos Project.''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/orocos-kinematics-dynamics/default.nix b/melodic/orocos-kinematics-dynamics/default.nix index 46cb6c8818..19dad9e62c 100644 --- a/melodic/orocos-kinematics-dynamics/default.nix +++ b/melodic/orocos-kinematics-dynamics/default.nix @@ -20,6 +20,6 @@ buildRosPackage { Library (KDL), distributed by the Orocos Project. It is a meta-package that depends on kdl which contains the c++ version and pykdl which contains the generated python bindings.''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/ouster-driver/default.nix b/melodic/ouster-driver/default.nix index e7d784f6fe..fd9528b79c 100644 --- a/melodic/ouster-driver/default.nix +++ b/melodic/ouster-driver/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "7f68cc7f16bf51c84ddf73d6db82c8352089ee1da21d2e6b1da177ce3697a950"; }; - buildInputs = [ message-generation pcl-ros std-msgs sensor-msgs roscpp pcl-conversions ]; - propagatedBuildInputs = [ message-runtime pcl-ros std-msgs sensor-msgs roscpp pcl-conversions ]; + buildInputs = [ sensor-msgs message-generation pcl-ros std-msgs roscpp pcl-conversions ]; + propagatedBuildInputs = [ sensor-msgs message-runtime pcl-ros std-msgs roscpp pcl-conversions ]; nativeBuildInputs = [ catkin ]; meta = { description = ''OS1 ROS client''; - #license = lib.licenses.Apache 2; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/oxford-gps-eth/default.nix b/melodic/oxford-gps-eth/default.nix index 69a8cf0a2e..f69c56c129 100644 --- a/melodic/oxford-gps-eth/default.nix +++ b/melodic/oxford-gps-eth/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "e746691aeed3c6c6613c51e9be0db75d5c0d5c2442453823a466fa15cac9ee7e"; }; - buildInputs = [ gps-common nav-msgs geometry-msgs sensor-msgs tf roscpp ]; + buildInputs = [ sensor-msgs roscpp gps-common nav-msgs tf geometry-msgs ]; checkInputs = [ rostest roslaunch ]; - propagatedBuildInputs = [ roslaunch gps-common nav-msgs geometry-msgs sensor-msgs tf roscpp ]; + propagatedBuildInputs = [ sensor-msgs roscpp gps-common nav-msgs roslaunch tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Ethernet interface to OxTS GPS receivers (NCOM packet structure)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/p2os-doc/default.nix b/melodic/p2os-doc/default.nix index 43d3986f01..5506126f05 100644 --- a/melodic/p2os-doc/default.nix +++ b/melodic/p2os-doc/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''Contains the Documentation for the p2os driver/componenets''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/p2os-driver/default.nix b/melodic/p2os-driver/default.nix index e89208f899..772e3c5c4d 100644 --- a/melodic/p2os-driver/default.nix +++ b/melodic/p2os-driver/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "6964b9f9c333b2290f586f8ea5bb23cd9bf6d3eb0e774dd33d2498624bae978d"; }; - buildInputs = [ diagnostic-updater nav-msgs kdl-parser geometry-msgs std-msgs tf roscpp p2os-msgs ]; - propagatedBuildInputs = [ kdl-parser roscpp p2os-msgs diagnostic-updater nav-msgs message-runtime std-msgs tf geometry-msgs ]; + buildInputs = [ kdl-parser roscpp p2os-msgs diagnostic-updater nav-msgs std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ kdl-parser tf p2os-msgs diagnostic-updater nav-msgs message-runtime std-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Driver file descriptions for P2OS/ARCOS robot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/p2os-launch/default.nix b/melodic/p2os-launch/default.nix index 8e7297b218..e964535f95 100644 --- a/melodic/p2os-launch/default.nix +++ b/melodic/p2os-launch/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Launch and config files designed for use with the p2os stack.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/p2os-msgs/default.nix b/melodic/p2os-msgs/default.nix index fcc4afa10e..f5a7e299c1 100644 --- a/melodic/p2os-msgs/default.nix +++ b/melodic/p2os-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Defines the messages that are used to communicate with the p2os_driver package and the ROS infrastructure.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/p2os-teleop/default.nix b/melodic/p2os-teleop/default.nix index 4478fe3e75..e9b990065b 100644 --- a/melodic/p2os-teleop/default.nix +++ b/melodic/p2os-teleop/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ std-msgs sensor-msgs tf geometry-msgs ]; - propagatedBuildInputs = [ message-runtime std-msgs sensor-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs message-runtime std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A teleoperation node for the p2os_driver package.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/p2os-urdf/default.nix b/melodic/p2os-urdf/default.nix index a12c4a64fe..896bad2f3c 100644 --- a/melodic/p2os-urdf/default.nix +++ b/melodic/p2os-urdf/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "10b0c2e34e4c56a3816165507eb40d1424b6d77c82f9fa09729e5f5069745c11"; }; - buildInputs = [ urdf kdl-parser std-msgs sensor-msgs tf geometry-msgs ]; - propagatedBuildInputs = [ urdf kdl-parser p2os-driver std-msgs sensor-msgs tf geometry-msgs p2os-msgs ]; + buildInputs = [ kdl-parser sensor-msgs urdf std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ kdl-parser p2os-driver sensor-msgs p2os-msgs urdf std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''URDF file descriptions for P2OS/ARCOS robot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pacmod-game-control/default.nix b/melodic/pacmod-game-control/default.nix index f876b89b0e..8f7b791120 100644 --- a/melodic/pacmod-game-control/default.nix +++ b/melodic/pacmod-game-control/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "279a95661041ef6f88cf7ba26f5f61af4010fac0ca579a38eddad0088f6dcabb"; }; - buildInputs = [ pacmod-msgs std-msgs sensor-msgs joy roscpp ]; - propagatedBuildInputs = [ pacmod-msgs std-msgs sensor-msgs joy roscpp ]; + buildInputs = [ sensor-msgs joy pacmod-msgs std-msgs roscpp ]; + propagatedBuildInputs = [ sensor-msgs joy pacmod-msgs std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS Package for controlling the AStuff PACMod with a Joystick''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/pacmod-msgs/default.nix b/melodic/pacmod-msgs/default.nix index 19668d5e47..99df958ee8 100644 --- a/melodic/pacmod-msgs/default.nix +++ b/melodic/pacmod-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message definition files for the PACMod driver''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/pacmod3/default.nix b/melodic/pacmod3/default.nix index 35a28be5f7..b91854b995 100644 --- a/melodic/pacmod3/default.nix +++ b/melodic/pacmod3/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''AutonomouStuff PACMod v3 Driver Package''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/panda-moveit-config/default.nix b/melodic/panda-moveit-config/default.nix index 6a4a9eb0eb..6464190df9 100644 --- a/melodic/panda-moveit-config/default.nix +++ b/melodic/panda-moveit-config/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''An automatically generated package with all the configuration and launch files for using the panda with the MoveIt! Motion Planning Framework''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/parrot-arsdk/default.nix b/melodic/parrot-arsdk/default.nix index f13384da38..6831d59ac2 100644 --- a/melodic/parrot-arsdk/default.nix +++ b/melodic/parrot-arsdk/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Catkin wrapper for the official ARSDK from Parrot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pcl-conversions/default.nix b/melodic/pcl-conversions/default.nix index 43f1b7ef32..1f3ab24ff4 100644 --- a/melodic/pcl-conversions/default.nix +++ b/melodic/pcl-conversions/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "14361d15d63002d2752dff7618967181b18d3bb43aaee0c42ac6eb563d1a921a"; }; - checkInputs = [ eigen std-msgs pcl sensor-msgs roscpp pcl-msgs ]; - propagatedBuildInputs = [ eigen std-msgs pcl sensor-msgs roscpp pcl-msgs ]; + checkInputs = [ pcl sensor-msgs pcl-msgs eigen std-msgs roscpp ]; + propagatedBuildInputs = [ pcl sensor-msgs pcl-msgs eigen std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Provides conversions from PCL data types and ROS message types''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pcl-msgs/default.nix b/melodic/pcl-msgs/default.nix index 66e33f168e..ae5bf54bbc 100644 --- a/melodic/pcl-msgs/default.nix +++ b/melodic/pcl-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Package containing PCL (Point Cloud Library)-related ROS messages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pcl-ros/default.nix b/melodic/pcl-ros/default.nix index b64b1d9bab..f0484999d6 100644 --- a/melodic/pcl-ros/default.nix +++ b/melodic/pcl-ros/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''PCL (Point Cloud Library) ROS interface stack. PCL-ROS is the preferred bridge for 3D applications involving n-D Point Clouds and 3D geometry processing in ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/people-msgs/default.nix b/melodic/people-msgs/default.nix index 06eb20abe1..73f71e908c 100644 --- a/melodic/people-msgs/default.nix +++ b/melodic/people-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages used by nodes in the people stack.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/people-tracking-filter/default.nix b/melodic/people-tracking-filter/default.nix index 3e9e1a3d28..186eeb0f74 100644 --- a/melodic/people-tracking-filter/default.nix +++ b/melodic/people-tracking-filter/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "1a0322dc068da4153612ec54bc60c3d5603217eb160da8c1632fa01c9578eeff"; }; - buildInputs = [ people-msgs bfl std-msgs sensor-msgs tf message-filters geometry-msgs roscpp ]; - propagatedBuildInputs = [ people-msgs bfl std-msgs sensor-msgs tf message-filters geometry-msgs roscpp ]; + buildInputs = [ people-msgs sensor-msgs message-filters roscpp bfl std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ people-msgs sensor-msgs message-filters roscpp bfl std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A collection of filtering tools for tracking people's locations''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/people-velocity-tracker/default.nix b/melodic/people-velocity-tracker/default.nix index 9e90d9530f..682fa829c5 100644 --- a/melodic/people-velocity-tracker/default.nix +++ b/melodic/people-velocity-tracker/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "57da6c218e5e9b052299795c8143a4efae4123d78dedb160a66ffa59251bc93c"; }; - buildInputs = [ easy-markers kalman-filter rospy people-msgs roslib geometry-msgs ]; - propagatedBuildInputs = [ easy-markers kalman-filter rospy people-msgs geometry-msgs roslib leg-detector ]; + buildInputs = [ kalman-filter people-msgs easy-markers rospy roslib geometry-msgs ]; + propagatedBuildInputs = [ kalman-filter people-msgs leg-detector easy-markers rospy roslib geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Track the output of the leg_detector to indicate the velocity of person.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/people/default.nix b/melodic/people/default.nix index bb562c4541..7bab4f125d 100644 --- a/melodic/people/default.nix +++ b/melodic/people/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "c9e1e3a253e0a4674504cf974f66e24d91ae6552eca545cd8fde925c94dd7bdc"; }; - propagatedBuildInputs = [ people-velocity-tracker face-detector people-msgs people-tracking-filter leg-detector ]; + propagatedBuildInputs = [ people-msgs leg-detector people-velocity-tracker people-tracking-filter face-detector ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The people stack holds algorithms for perceiving people from a number of sensors.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pepperl-fuchs-r2000/default.nix b/melodic/pepperl-fuchs-r2000/default.nix index 521cb48be6..86e63ef8ae 100644 --- a/melodic/pepperl-fuchs-r2000/default.nix +++ b/melodic/pepperl-fuchs-r2000/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The Pepperl+Fuchs R2000 laser range finder driver package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/perception-pcl/default.nix b/melodic/perception-pcl/default.nix index 6fce4c61f2..452d093bf0 100644 --- a/melodic/perception-pcl/default.nix +++ b/melodic/perception-pcl/default.nix @@ -19,6 +19,6 @@ buildRosPackage { description = ''PCL (Point Cloud Library) ROS interface stack. PCL-ROS is the preferred bridge for 3D applications involving n-D Point Clouds and 3D geometry processing in ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/perception/default.nix b/melodic/perception/default.nix index 9c30c21a00..8391490a21 100644 --- a/melodic/perception/default.nix +++ b/melodic/perception/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "f6024982eaa029dafbe20bd1e533f46766f9731a485a837e4a450331f5594126"; }; - propagatedBuildInputs = [ image-pipeline laser-pipeline perception-pcl ros-base vision-opencv image-common image-transport-plugins ]; + propagatedBuildInputs = [ image-pipeline vision-opencv ros-base image-common image-transport-plugins laser-pipeline perception-pcl ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A metapackage to aggregate several packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pheeno-ros-description/default.nix b/melodic/pheeno-ros-description/default.nix index a9b1e353ef..6e72a677d7 100644 --- a/melodic/pheeno-ros-description/default.nix +++ b/melodic/pheeno-ros-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The pheeno_ros_description package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/phidgets-api/default.nix b/melodic/phidgets-api/default.nix index 2169d8506b..779541448e 100644 --- a/melodic/phidgets-api/default.nix +++ b/melodic/phidgets-api/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''A C++ Wrapper for the Phidgets C API''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/phidgets-drivers/default.nix b/melodic/phidgets-drivers/default.nix index 532c1cc63f..c76fbc0fb1 100644 --- a/melodic/phidgets-drivers/default.nix +++ b/melodic/phidgets-drivers/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''API and ROS drivers for Phidgets devices''; - #license = lib.licenses.BSD, LGPL; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/phidgets-high-speed-encoder/default.nix b/melodic/phidgets-high-speed-encoder/default.nix index 9a262d7eb4..91a4eb587e 100644 --- a/melodic/phidgets-high-speed-encoder/default.nix +++ b/melodic/phidgets-high-speed-encoder/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "462219fb56f8ef2d8fbcf1b6237a6313fc1c5612f883cb0385ef3bfd5ae7f063"; }; - buildInputs = [ phidgets-api message-generation libphidget21 std-msgs sensor-msgs roscpp ]; - propagatedBuildInputs = [ phidgets-api message-runtime libphidget21 std-msgs sensor-msgs roscpp ]; + buildInputs = [ phidgets-api libphidget21 sensor-msgs message-generation std-msgs roscpp ]; + propagatedBuildInputs = [ phidgets-api libphidget21 sensor-msgs message-runtime std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Driver for the Phidgets high speed encoder devices''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/phidgets-ik/default.nix b/melodic/phidgets-ik/default.nix index 65ed515d94..bb24799aa5 100644 --- a/melodic/phidgets-ik/default.nix +++ b/melodic/phidgets-ik/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "961d4102b53a0c33873c0cf8ac376d3bebe6e54f636c461600619b379d52fec7"; }; - buildInputs = [ phidgets-api message-generation nodelet geometry-msgs std-msgs sensor-msgs tf roscpp ]; - propagatedBuildInputs = [ phidgets-api message-runtime nodelet geometry-msgs std-msgs sensor-msgs tf roscpp ]; + buildInputs = [ phidgets-api sensor-msgs roscpp message-generation nodelet std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ phidgets-api sensor-msgs roscpp message-runtime nodelet std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Driver for the Phidgets InterfaceKit devices''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/phidgets-imu/default.nix b/melodic/phidgets-imu/default.nix index db858ae7a9..713f9ebfe3 100644 --- a/melodic/phidgets-imu/default.nix +++ b/melodic/phidgets-imu/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Driver for the Phidgets Spatial 3/3/3 devices''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/photo/default.nix b/melodic/photo/default.nix index 62b494e549..f08a973f6c 100644 --- a/melodic/photo/default.nix +++ b/melodic/photo/default.nix @@ -2,22 +2,22 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, self-test, sensor-msgs, catkin, message-generation, message-runtime, libgphoto2, std-msgs, roscpp }: +{ lib, buildRosPackage, fetchurl, self-test, sensor-msgs, catkin, message-generation, message-runtime, libgphoto2, std-msgs, roscpp, opencv3 }: buildRosPackage { pname = "ros-melodic-photo"; - version = "1.0.2"; + version = "1.0.3-r1"; src = fetchurl { - url = https://github.com/bosch-ros-pkg/photo-release/archive/release/melodic/photo/1.0.2-0.tar.gz; - sha256 = "5ab583e7e4fa6f71d8d382ae733500dfa930700b6505f9d3fe52c92619852391"; + url = https://github.com/bosch-ros-pkg/photo-release/archive/release/melodic/photo/1.0.3-1.tar.gz; + sha256 = "61ab67a9bc3909382c062c6c93be55830c71b889b35326014bf3966b88fb354f"; }; - buildInputs = [ message-generation self-test libgphoto2 std-msgs sensor-msgs roscpp ]; - propagatedBuildInputs = [ message-runtime self-test libgphoto2 std-msgs sensor-msgs roscpp ]; + buildInputs = [ self-test sensor-msgs message-generation libgphoto2 std-msgs roscpp opencv3 ]; + propagatedBuildInputs = [ self-test sensor-msgs message-runtime libgphoto2 std-msgs roscpp opencv3 ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The photo package provides access to digital cameras. Much of the underlying functionality is provide by the gPhoto libary. The system package libgphoto2-2-dev or equivalent is required.>''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pid/default.nix b/melodic/pid/default.nix index 5799db4bb4..f3db015df8 100644 --- a/melodic/pid/default.nix +++ b/melodic/pid/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Launch a PID control node.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pilz-control/default.nix b/melodic/pilz-control/default.nix index d48fc46384..615b6cf4a8 100644 --- a/melodic/pilz-control/default.nix +++ b/melodic/pilz-control/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "4ab1a3cf20ab9a31e256bc2e750d7040b10038afe80715e149921a4c7efb56e6"; }; - buildInputs = [ controller-manager std-srvs controller-interface cmake-modules roslint roscpp joint-trajectory-controller ]; + buildInputs = [ controller-manager std-srvs cmake-modules roslint joint-trajectory-controller controller-interface roscpp ]; checkInputs = [ rostest code-coverage ]; - propagatedBuildInputs = [ controller-manager std-srvs controller-interface roscpp joint-trajectory-controller ]; + propagatedBuildInputs = [ controller-manager std-srvs joint-trajectory-controller controller-interface roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package provides a specialized joint_trajectory_controller that can be moved into holding state via service call. No further trajectories will be accepted/followed in this state.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/pilz-extensions/default.nix b/melodic/pilz-extensions/default.nix index 59ad526bf9..09772226ae 100644 --- a/melodic/pilz-extensions/default.nix +++ b/melodic/pilz-extensions/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The pilz_extensions package. Here are classes extending the functionality of other packages. On the long run these extensions should become pull requests on the respective packages.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/pilz-industrial-motion-testutils/default.nix b/melodic/pilz-industrial-motion-testutils/default.nix index 041395949e..f1f1018bc7 100644 --- a/melodic/pilz-industrial-motion-testutils/default.nix +++ b/melodic/pilz-industrial-motion-testutils/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Helper scripts and functionality to test industrial motion generation''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/pilz-industrial-motion/default.nix b/melodic/pilz-industrial-motion/default.nix index 4e1f5b31cc..1a5e2d46af 100644 --- a/melodic/pilz-industrial-motion/default.nix +++ b/melodic/pilz-industrial-motion/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The pilz_industrial_motion package''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/pilz-msgs/default.nix b/melodic/pilz-msgs/default.nix index 7d24575a09..a648403236 100644 --- a/melodic/pilz-msgs/default.nix +++ b/melodic/pilz-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The pilz_msgs package''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/pilz-robot-programming/default.nix b/melodic/pilz-robot-programming/default.nix index 222336696c..77a6d631f3 100644 --- a/melodic/pilz-robot-programming/default.nix +++ b/melodic/pilz-robot-programming/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, roslint, prbt-moveit-config, tf, prbt-pg70-support, pythonPackages, catkin, rostest, pilz-industrial-motion-testutils, moveit-commander, rospy, tf-conversions, pilz-msgs, pilz-trajectory-generation }: +{ lib, buildRosPackage, fetchurl, roslint, prbt-moveit-config, prbt-pg70-support, pythonPackages, catkin, pilz-msgs, rostest, pilz-industrial-motion-testutils, moveit-commander, rospy, tf-conversions, tf, pilz-trajectory-generation }: buildRosPackage { pname = "ros-melodic-pilz-robot-programming"; version = "0.4.3"; @@ -13,12 +13,12 @@ buildRosPackage { }; buildInputs = [ roslint rospy ]; - checkInputs = [ rostest pilz-industrial-motion-testutils pythonPackages.coverage prbt-moveit-config pythonPackages.docopt prbt-pg70-support ]; - propagatedBuildInputs = [ pythonPackages.psutil moveit-commander tf-conversions rospy tf pilz-msgs pilz-trajectory-generation ]; + checkInputs = [ prbt-moveit-config prbt-pg70-support rostest pilz-industrial-motion-testutils pythonPackages.coverage pythonPackages.docopt ]; + propagatedBuildInputs = [ pythonPackages.psutil pilz-msgs moveit-commander rospy tf-conversions tf pilz-trajectory-generation ]; nativeBuildInputs = [ catkin ]; meta = { description = ''An Easy to use API to execute standard industrial robot commands like Ptp, Lin, Circ and Sequence using Moveit.''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/pilz-robots/default.nix b/melodic/pilz-robots/default.nix index a717d70cc1..ab7fea4e42 100644 --- a/melodic/pilz-robots/default.nix +++ b/melodic/pilz-robots/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The metapackage''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/pilz-testutils/default.nix b/melodic/pilz-testutils/default.nix index 9aa370b4b6..bbfca3f42d 100644 --- a/melodic/pilz-testutils/default.nix +++ b/melodic/pilz-testutils/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''This package contains testing utilities used by Pilz packages.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/pilz-trajectory-generation/default.nix b/melodic/pilz-trajectory-generation/default.nix index 815d936c82..6e663c11eb 100644 --- a/melodic/pilz-trajectory-generation/default.nix +++ b/melodic/pilz-trajectory-generation/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "dc396f21535578ae455a1800bac7d18d1f0e8fb0dfa9cdeb7b2079203913bfc9"; }; - buildInputs = [ moveit-ros-planning kdl-conversions moveit-ros-move-group pluginlib tf2-geometry-msgs orocos-kdl pilz-extensions roscpp tf2 moveit-core tf2-eigen moveit-msgs eigen-conversions pilz-msgs moveit-ros-planning-interface ]; - checkInputs = [ cmake-modules prbt-moveit-config prbt-support pilz-testutils prbt-pg70-support rostest pilz-industrial-motion-testutils code-coverage rosunit ]; - propagatedBuildInputs = [ moveit-ros-planning kdl-conversions moveit-ros-move-group pluginlib tf2-geometry-msgs orocos-kdl pilz-extensions roscpp tf2 moveit-core tf2-eigen moveit-msgs eigen-conversions pilz-msgs moveit-ros-planning-interface ]; + buildInputs = [ moveit-ros-planning kdl-conversions moveit-ros-move-group orocos-kdl pluginlib tf2-geometry-msgs pilz-extensions roscpp tf2 moveit-core tf2-eigen moveit-msgs eigen-conversions pilz-msgs moveit-ros-planning-interface ]; + checkInputs = [ prbt-support cmake-modules prbt-moveit-config pilz-testutils prbt-pg70-support rostest pilz-industrial-motion-testutils code-coverage rosunit ]; + propagatedBuildInputs = [ moveit-ros-planning kdl-conversions moveit-ros-move-group orocos-kdl pluginlib tf2-geometry-msgs pilz-extensions roscpp tf2 moveit-core tf2-eigen moveit-msgs eigen-conversions pilz-msgs moveit-ros-planning-interface ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The pilz_trajectory_generation package containing the MoveIt! plugin pilz_command_planner.''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/pinocchio/default.nix b/melodic/pinocchio/default.nix index be2a80236e..845884cc7d 100644 --- a/melodic/pinocchio/default.nix +++ b/melodic/pinocchio/default.nix @@ -5,19 +5,19 @@ { lib, buildRosPackage, fetchurl, python, boost, git, catkin, pythonPackages, urdfdom, eigen, eigenpy }: buildRosPackage { pname = "ros-melodic-pinocchio"; - version = "2.0.0"; + version = "2.1.3-r1"; src = fetchurl { - url = https://github.com/ipab-slmc/pinocchio_catkin-release/archive/release/melodic/pinocchio/2.0.0-0.tar.gz; - sha256 = "8f84f420cbee52acb26755fd7bdba3f06013bccc0f1134d080f1bca9a37fa7ff"; + url = https://github.com/ipab-slmc/pinocchio_catkin-release/archive/release/melodic/pinocchio/2.1.3-1.tar.gz; + sha256 = "55e2abcacc5f041bb5aac36853a0114852d76d03bdbe29c5a257f39429360fc6"; }; - buildInputs = [ python pythonPackages.numpy boost eigen eigenpy git urdfdom ]; - propagatedBuildInputs = [ python pythonPackages.numpy boost eigen eigenpy urdfdom ]; + buildInputs = [ python pythonPackages.numpy boost git urdfdom eigen eigenpy ]; + propagatedBuildInputs = [ python pythonPackages.numpy boost urdfdom eigenpy eigen ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives - wrapped for catkin.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/planner-cspace-msgs/default.nix b/melodic/planner-cspace-msgs/default.nix index 288c372c42..9b71aaf7fa 100644 --- a/melodic/planner-cspace-msgs/default.nix +++ b/melodic/planner-cspace-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message definitions for planner_cspace package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/plotjuggler/default.nix b/melodic/plotjuggler/default.nix index e94ff5948f..562aeb33bb 100644 --- a/melodic/plotjuggler/default.nix +++ b/melodic/plotjuggler/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "0a93dd9c3dd1fc1e579699a8c8b776bec347349364ae53fc97e2a541d7ee1068"; }; - buildInputs = [ rosbag-storage qt5.qtmultimedia ros-type-introspection rosbag rostime qt5.qtbase roscpp binutils roscpp-serialization topic-tools qt5.qtdeclarative tf ]; - propagatedBuildInputs = [ rosbag-storage qt5.qtmultimedia ros-type-introspection rosbag rostime qt5.qtbase roscpp binutils roscpp-serialization topic-tools qt5.qtdeclarative tf ]; + buildInputs = [ rosbag-storage qt5.qtmultimedia rosbag ros-type-introspection rostime qt5.qtbase roscpp binutils roscpp-serialization topic-tools qt5.qtdeclarative tf ]; + propagatedBuildInputs = [ rosbag-storage qt5.qtmultimedia rosbag ros-type-introspection rostime qt5.qtbase roscpp binutils roscpp-serialization topic-tools qt5.qtdeclarative tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''PlotJuggler: juggle with data''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/pluginlib-tutorials/default.nix b/melodic/pluginlib-tutorials/default.nix index 90edc8a905..96448b6070 100644 --- a/melodic/pluginlib-tutorials/default.nix +++ b/melodic/pluginlib-tutorials/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The pluginlib_tutorials package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pluginlib/default.nix b/melodic/pluginlib/default.nix index 53aab3114e..3619ef2c29 100644 --- a/melodic/pluginlib/default.nix +++ b/melodic/pluginlib/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "51ad8cc72b954cf0fb32b8e562eaa2f24d830ce72832320582ec2075b95958e1"; }; - buildInputs = [ cmake-modules rosconsole boost tinyxml-2 class-loader roslib ]; - propagatedBuildInputs = [ tinyxml-2 rosconsole boost class-loader roslib ]; + buildInputs = [ cmake-modules rosconsole boost class-loader tinyxml-2 roslib ]; + propagatedBuildInputs = [ rosconsole boost class-loader tinyxml-2 roslib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The pluginlib package provides tools for writing and dynamically loading plugins using the ROS build infrastructure. To work, these tools require plugin providers to register their plugins in the package.xml of their package.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pointcloud-to-laserscan/default.nix b/melodic/pointcloud-to-laserscan/default.nix index 208fbbaae3..15c52364b6 100644 --- a/melodic/pointcloud-to-laserscan/default.nix +++ b/melodic/pointcloud-to-laserscan/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, roslint, sensor-msgs, catkin, message-filters, tf2-ros, tf2-sensor-msgs, tf2, nodelet, roscpp }: +{ lib, buildRosPackage, fetchurl, roslint, sensor-msgs, catkin, message-filters, tf2-ros, roscpp, tf2-sensor-msgs, tf2, nodelet }: buildRosPackage { pname = "ros-melodic-pointcloud-to-laserscan"; version = "1.4.0"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "58e4c4ce3d73beaebecfda86a761f17d4680cad274ab57d361ab9bdfe726b29c"; }; - buildInputs = [ tf2-sensor-msgs tf2 nodelet sensor-msgs roscpp message-filters tf2-ros ]; + buildInputs = [ sensor-msgs message-filters tf2-ros tf2-sensor-msgs tf2 nodelet roscpp ]; checkInputs = [ roslint ]; - propagatedBuildInputs = [ tf2-sensor-msgs tf2 nodelet sensor-msgs roscpp message-filters tf2-ros ]; + propagatedBuildInputs = [ sensor-msgs message-filters tf2-ros tf2-sensor-msgs tf2 nodelet roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Converts a 3D Point Cloud into a 2D laser scan. This is useful for making devices like the Kinect appear like a laser scanner for 2D-based algorithms (e.g. laser-based SLAM).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/polled-camera/default.nix b/melodic/polled-camera/default.nix index 864f2571bf..f52b62998b 100644 --- a/melodic/polled-camera/default.nix +++ b/melodic/polled-camera/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "87717ae0569b27aeccb0c84c372ef5e5b16ea23e4549f918d7a2ad1ba88464f3"; }; - buildInputs = [ message-generation std-msgs image-transport sensor-msgs roscpp ]; - propagatedBuildInputs = [ message-runtime std-msgs image-transport sensor-msgs roscpp ]; + buildInputs = [ image-transport sensor-msgs message-generation std-msgs roscpp ]; + propagatedBuildInputs = [ image-transport sensor-msgs message-runtime std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''polled_camera contains a service and C++ helper classes for implementing a polled camera driver node and requesting images from it. The package is currently for internal use as the API is still under development.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pose-base-controller/default.nix b/melodic/pose-base-controller/default.nix index ace65e6be1..e75fda4085 100644 --- a/melodic/pose-base-controller/default.nix +++ b/melodic/pose-base-controller/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "92fdd5e9e92e018a8ecbb45cf342f449ad33550922b7b9de82b27c54c131af48"; }; - buildInputs = [ move-base-msgs nav-msgs tf2-ros tf2-geometry-msgs actionlib roscpp geometry-msgs ]; - propagatedBuildInputs = [ move-base-msgs nav-msgs tf2-ros tf2-geometry-msgs actionlib roscpp geometry-msgs ]; + buildInputs = [ tf2-geometry-msgs tf2-ros move-base-msgs nav-msgs actionlib roscpp geometry-msgs ]; + propagatedBuildInputs = [ tf2-geometry-msgs tf2-ros move-base-msgs nav-msgs actionlib roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A node that provides the move_base action server interface, but instead of planning simply drives towards the target pose using a control-based approach.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pose-cov-ops/default.nix b/melodic/pose-cov-ops/default.nix index f7a7180250..c77badb7da 100644 --- a/melodic/pose-cov-ops/default.nix +++ b/melodic/pose-cov-ops/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''C++ library for SE(2/3) pose and 2D/3D point composition operations with uncertainty''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pose-follower/default.nix b/melodic/pose-follower/default.nix index 129289883c..54edcafb59 100644 --- a/melodic/pose-follower/default.nix +++ b/melodic/pose-follower/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "00042ebe7ca9c50846ca0a358020ec6484b53775106fe2f8539acdf3b400981b"; }; - buildInputs = [ costmap-2d nav-msgs pluginlib base-local-planner tf2-geometry-msgs nav-core roscpp tf2-ros ]; - propagatedBuildInputs = [ costmap-2d nav-msgs pluginlib base-local-planner tf2-geometry-msgs nav-core roscpp tf2-ros ]; + buildInputs = [ costmap-2d pluginlib base-local-planner tf2-geometry-msgs nav-core tf2-ros nav-msgs roscpp ]; + propagatedBuildInputs = [ costmap-2d pluginlib base-local-planner tf2-geometry-msgs nav-core tf2-ros nav-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A implementation of a local planner that attempts to follow a plan as closely as possible.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/posedetection-msgs/default.nix b/melodic/posedetection-msgs/default.nix index 9fdb31d241..de0f429840 100644 --- a/melodic/posedetection-msgs/default.nix +++ b/melodic/posedetection-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "1538ca360bd31dcfa85392ba78374d072d64a3426425c64b08d8db149ea5cd3a"; }; - buildInputs = [ message-generation geometry-msgs std-msgs sensor-msgs cv-bridge message-filters roscpp ]; - propagatedBuildInputs = [ message-runtime geometry-msgs std-msgs sensor-msgs cv-bridge message-filters roscpp ]; + buildInputs = [ sensor-msgs cv-bridge message-filters message-generation std-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs cv-bridge message-filters message-runtime std-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''posedetection_msgs provides messages and services to facilitate passing pose detection results and features.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/position-controllers/default.nix b/melodic/position-controllers/default.nix index 9093bfb8d3..6e0d42b91f 100644 --- a/melodic/position-controllers/default.nix +++ b/melodic/position-controllers/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''position_controllers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/power-monitor/default.nix b/melodic/power-monitor/default.nix index 1d8e108087..f4952f3617 100644 --- a/melodic/power-monitor/default.nix +++ b/melodic/power-monitor/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''The power_monitor collects messages from the ocean_battery_server and the pr2_power_board, and publishes a summary of their data in a friendlier message format.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/power-msgs/default.nix b/melodic/power-msgs/default.nix index 24bdb30e0b..c085820874 100644 --- a/melodic/power-msgs/default.nix +++ b/melodic/power-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS messages for power measurement and breaker control.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-app-manager/default.nix b/melodic/pr2-app-manager/default.nix index 95b6f2f18a..d982730e92 100644 --- a/melodic/pr2-app-manager/default.nix +++ b/melodic/pr2-app-manager/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Scripts and tools for running the application manager on the PR2.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-apps/default.nix b/melodic/pr2-apps/default.nix index f5c6ce00ab..77a01b4758 100644 --- a/melodic/pr2-apps/default.nix +++ b/melodic/pr2-apps/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Basic applications for the PR2 robot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-arm-kinematics/default.nix b/melodic/pr2-arm-kinematics/default.nix index 710271f9bf..92dfed9b46 100644 --- a/melodic/pr2-arm-kinematics/default.nix +++ b/melodic/pr2-arm-kinematics/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package provides a kinematics implementation for the PR2 robot. It can be used to compute forward and inverse kinematics.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-arm-move-ik/default.nix b/melodic/pr2-arm-move-ik/default.nix index cbb978fc59..73b1af747e 100644 --- a/melodic/pr2-arm-move-ik/default.nix +++ b/melodic/pr2-arm-move-ik/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, pr2-controllers-msgs, actionlib-msgs, pr2-common-action-msgs, tf, catkin, urdf, actionlib, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, pr2-controllers-msgs, actionlib-msgs, pr2-common-action-msgs, catkin, roscpp, urdf, actionlib, tf, geometry-msgs }: buildRosPackage { pname = "ros-melodic-pr2-arm-move-ik"; version = "0.0.11"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "8051d2f766e269e465921bb3b85eb08ab5a8f24c1e9e0f2ee7422665e5f23eee"; }; - buildInputs = [ pr2-controllers-msgs urdf actionlib-msgs actionlib pr2-common-action-msgs geometry-msgs tf roscpp ]; - propagatedBuildInputs = [ pr2-controllers-msgs urdf actionlib-msgs actionlib pr2-common-action-msgs geometry-msgs tf roscpp ]; + buildInputs = [ pr2-controllers-msgs actionlib-msgs pr2-common-action-msgs tf urdf actionlib roscpp geometry-msgs ]; + propagatedBuildInputs = [ pr2-controllers-msgs actionlib-msgs pr2-common-action-msgs tf urdf actionlib roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Move the pr2 arm using inverse kinematics''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-calibration-controllers/default.nix b/melodic/pr2-calibration-controllers/default.nix index 209f95de45..44af8184a4 100644 --- a/melodic/pr2-calibration-controllers/default.nix +++ b/melodic/pr2-calibration-controllers/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "9ea80cb06d1d5a1c20b6387b178bcc653d63d66d7acce59de628c25d944a9cf3"; }; - buildInputs = [ pr2-mechanism-controllers pluginlib pr2-controller-interface std-msgs realtime-tools roscpp pr2-mechanism-model robot-mechanism-controllers ]; - propagatedBuildInputs = [ pr2-mechanism-controllers pluginlib pr2-controller-interface std-msgs realtime-tools roscpp pr2-mechanism-model robot-mechanism-controllers ]; + buildInputs = [ pr2-mechanism-controllers pluginlib pr2-controller-interface realtime-tools robot-mechanism-controllers std-msgs roscpp pr2-mechanism-model ]; + propagatedBuildInputs = [ pr2-mechanism-controllers pluginlib pr2-controller-interface realtime-tools robot-mechanism-controllers std-msgs roscpp pr2-mechanism-model ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The pr2_calibration_controllers package contains the controllers used to bring all the joints in the PR2 to a calibrated state.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-common-action-msgs/default.nix b/melodic/pr2-common-action-msgs/default.nix index 7c4a676dfe..b6bbb60606 100644 --- a/melodic/pr2-common-action-msgs/default.nix +++ b/melodic/pr2-common-action-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The pr2_common_action_msgs package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-common-actions/default.nix b/melodic/pr2-common-actions/default.nix index 6250e14069..847be06e0d 100644 --- a/melodic/pr2-common-actions/default.nix +++ b/melodic/pr2-common-actions/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "80fd608e81e3b4797e06188ddba9351c1cd1937e04985ff61c6c4d72e8a546ea"; }; - propagatedBuildInputs = [ pr2-arm-move-ik pr2-tilt-laser-interface joint-trajectory-generator pr2-common-action-msgs pr2-tuck-arms-action joint-trajectory-action-tools ]; + propagatedBuildInputs = [ pr2-tilt-laser-interface joint-trajectory-generator pr2-common-action-msgs pr2-arm-move-ik pr2-tuck-arms-action joint-trajectory-action-tools ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Various actions which help in moving the arms of the PR2 or getting data from its tilting laser.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-common/default.nix b/melodic/pr2-common/default.nix index aa75bf7b92..23119091cf 100644 --- a/melodic/pr2-common/default.nix +++ b/melodic/pr2-common/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''URDF description of the robot kinematics and dynamics, 3D models of robot components, information required for gazebo to simulate the PR2, and messages specific to the PR2 such as detailed information about its power board and fingertip pressure sensors.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-controller-configuration-gazebo/default.nix b/melodic/pr2-controller-configuration-gazebo/default.nix index ae5bc2b1ac..fff9ce54fe 100644 --- a/melodic/pr2-controller-configuration-gazebo/default.nix +++ b/melodic/pr2-controller-configuration-gazebo/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "5c439cea522e3fdbd04cb520d3adb886513eff5a52619491b6a2f4e3d84f38fb"; }; - propagatedBuildInputs = [ single-joint-position-action pr2-controller-manager pr2-head-action gazeboSimulator.gazebo pr2-gripper-action ]; + propagatedBuildInputs = [ pr2-head-action gazeboSimulator.gazebo pr2-gripper-action single-joint-position-action pr2-controller-manager ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A copy of the pr2_controller_configuration package, for use in the PR2 simulator. We maintain two copies to allow for controller gains to be set differently between hardware and simulation.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-controller-interface/default.nix b/melodic/pr2-controller-interface/default.nix index 15bad1a3ce..cf0da02e5d 100644 --- a/melodic/pr2-controller-interface/default.nix +++ b/melodic/pr2-controller-interface/default.nix @@ -23,6 +23,6 @@ buildRosPackage { manager in the real time control loop. The package basically contains the C++ controller base class that all controllers need to inherit from.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-controller-manager/default.nix b/melodic/pr2-controller-manager/default.nix index c93e90befc..a86e7d8fe8 100644 --- a/melodic/pr2-controller-manager/default.nix +++ b/melodic/pr2-controller-manager/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The controller manager (CM) package provides the infrastructure to run controllers in a hard realtime loop.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-controllers-msgs/default.nix b/melodic/pr2-controllers-msgs/default.nix index 8dff8492fd..6c7caeaaed 100644 --- a/melodic/pr2-controllers-msgs/default.nix +++ b/melodic/pr2-controllers-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages, services, and actions used in the pr2_controllers stack.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-controllers/default.nix b/melodic/pr2-controllers/default.nix index 8d74391799..3f6e5638b4 100644 --- a/melodic/pr2-controllers/default.nix +++ b/melodic/pr2-controllers/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Contains the controllers that run in realtime on the PR2 and supporting packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-dashboard-aggregator/default.nix b/melodic/pr2-dashboard-aggregator/default.nix index f2d2ca4bbf..6121714159 100644 --- a/melodic/pr2-dashboard-aggregator/default.nix +++ b/melodic/pr2-dashboard-aggregator/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A simple script that aggregates all of the topics that a "pr2_dashboard" app might be interested in.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-description/default.nix b/melodic/pr2-description/default.nix index 4b5c836fb6..2a932ec978 100644 --- a/melodic/pr2-description/default.nix +++ b/melodic/pr2-description/default.nix @@ -22,6 +22,6 @@ buildRosPackage { etc.) of the PR2 robot. The files in this package are parsed and used by a variety of other components. Most users will not interact directly with this package.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-ethercat-drivers/default.nix b/melodic/pr2-ethercat-drivers/default.nix index 9d3280deac..6b0982df7f 100644 --- a/melodic/pr2-ethercat-drivers/default.nix +++ b/melodic/pr2-ethercat-drivers/default.nix @@ -19,6 +19,6 @@ buildRosPackage { description = ''This stack contains drivers for the ethercat system and the peripherals that connect to it: motor control boards, fingertip sensors, texture projector, hand accelerometer.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal gpl1 ]; }; } diff --git a/melodic/pr2-gazebo-plugins/default.nix b/melodic/pr2-gazebo-plugins/default.nix index 562999b728..21c7c43e75 100644 --- a/melodic/pr2-gazebo-plugins/default.nix +++ b/melodic/pr2-gazebo-plugins/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "f13b8d70bb7029d167343772dc662a7aff687349c40ecb02e27020a36a8a784b"; }; - buildInputs = [ std-srvs pr2-hardware-interface orocos-kdl cv-bridge polled-camera gazebo-plugins nav-msgs urdf rospy std-msgs diagnostic-msgs roscpp tf pr2-mechanism-model gazebo-msgs geometry-msgs image-transport sensor-msgs diagnostic-updater pr2-controller-manager message-generation message-runtime angles pr2-msgs ]; - propagatedBuildInputs = [ gazebo-ros pr2-hardware-interface orocos-kdl cv-bridge polled-camera gazebo-plugins nav-msgs urdf rospy std-msgs diagnostic-msgs tf roscpp pr2-mechanism-model gazebo-msgs geometry-msgs image-transport sensor-msgs diagnostic-updater pr2-controller-manager message-generation message-runtime angles pr2-msgs ]; + buildInputs = [ cv-bridge polled-camera gazebo-plugins rospy diagnostic-msgs tf gazebo-msgs geometry-msgs image-transport pr2-controller-manager message-generation message-runtime angles pr2-msgs std-srvs pr2-hardware-interface orocos-kdl nav-msgs urdf std-msgs roscpp pr2-mechanism-model sensor-msgs diagnostic-updater ]; + propagatedBuildInputs = [ cv-bridge polled-camera gazebo-plugins rospy diagnostic-msgs tf gazebo-msgs geometry-msgs image-transport pr2-controller-manager message-generation message-runtime angles pr2-msgs gazebo-ros pr2-hardware-interface orocos-kdl nav-msgs urdf std-msgs roscpp pr2-mechanism-model sensor-msgs diagnostic-updater ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Gazebo Plugins for various PR2-specific sensors and actuators on the robot.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-gazebo/default.nix b/melodic/pr2-gazebo/default.nix index 7a64ba9f09..fafc0e6022 100644 --- a/melodic/pr2-gazebo/default.nix +++ b/melodic/pr2-gazebo/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, pr2-description, gazebo-plugins, fingertip-pressure, rospy, geometry-msgs, pr2-tuckarm, pr2-mechanism-controllers, pr2-gazebo-plugins, gazeboSimulator, pr2-controller-manager, robot-pose-ekf, robot-state-publisher, pr2-dashboard-aggregator, image-proc, pr2-msgs, xacro, gazebo-ros, pr2-head-action, catkin, robot-mechanism-controllers, tf2-ros, pr2-machine, std-msgs, diagnostic-aggregator, pr2-controller-configuration-gazebo, stereo-image-proc, joint-trajectory-action, pr2-gripper-action, rostest, single-joint-position-action, rostopic, topic-tools }: +{ lib, buildRosPackage, fetchurl, pr2-description, gazebo-plugins, fingertip-pressure, rospy, geometry-msgs, pr2-tuckarm, pr2-mechanism-controllers, pr2-gazebo-plugins, gazeboSimulator, pr2-controller-manager, robot-pose-ekf, robot-state-publisher, pr2-dashboard-aggregator, pr2-msgs, image-proc, xacro, gazebo-ros, pr2-head-action, catkin, robot-mechanism-controllers, tf2-ros, pr2-machine, std-msgs, diagnostic-aggregator, pr2-controller-configuration-gazebo, stereo-image-proc, joint-trajectory-action, pr2-gripper-action, rostest, single-joint-position-action, rostopic, topic-tools }: buildRosPackage { pname = "ros-melodic-pr2-gazebo"; version = "2.0.14"; @@ -14,13 +14,13 @@ buildRosPackage { buildInputs = [ pr2-gazebo-plugins gazeboSimulator.gazebo gazebo-plugins ]; checkInputs = [ pr2-machine rostest pr2-tuckarm ]; - propagatedBuildInputs = [ gazebo-ros pr2-description pr2-head-action gazeboSimulator.gazebo robot-mechanism-controllers tf2-ros gazebo-plugins fingertip-pressure rospy std-msgs diagnostic-aggregator pr2-controller-configuration-gazebo geometry-msgs pr2-mechanism-controllers stereo-image-proc joint-trajectory-action pr2-gazebo-plugins image-proc pr2-gripper-action single-joint-position-action pr2-controller-manager robot-pose-ekf rostopic robot-state-publisher topic-tools pr2-dashboard-aggregator pr2-msgs xacro ]; + propagatedBuildInputs = [ pr2-description gazeboSimulator.gazebo gazebo-plugins fingertip-pressure rospy geometry-msgs pr2-mechanism-controllers pr2-gazebo-plugins pr2-controller-manager robot-pose-ekf robot-state-publisher pr2-dashboard-aggregator pr2-msgs image-proc xacro gazebo-ros pr2-head-action robot-mechanism-controllers tf2-ros std-msgs diagnostic-aggregator pr2-controller-configuration-gazebo stereo-image-proc joint-trajectory-action pr2-gripper-action single-joint-position-action rostopic topic-tools ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Launch scripts for simulating the PR2 in gazebo. The simulation equivalent of pr2.launch is found here. pr2_fingertip_pressure_contact_translator produces the same ROS topics as fingertip_pressure package for simulated PR2.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-gripper-action/default.nix b/melodic/pr2-gripper-action/default.nix index 95a9c12e5e..5e528fc3d7 100644 --- a/melodic/pr2-gripper-action/default.nix +++ b/melodic/pr2-gripper-action/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "c2af780c2458ba7a28fcef738f8b231d59367ee9e82aea74f9fe4802216b6402"; }; - buildInputs = [ pr2-controllers-msgs pr2-mechanism-controllers actionlib-msgs actionlib roscpp pr2-mechanism-model robot-mechanism-controllers ]; - propagatedBuildInputs = [ pr2-controllers-msgs pr2-mechanism-controllers actionlib-msgs actionlib roscpp pr2-mechanism-model robot-mechanism-controllers ]; + buildInputs = [ pr2-controllers-msgs pr2-mechanism-controllers actionlib-msgs robot-mechanism-controllers actionlib roscpp pr2-mechanism-model ]; + propagatedBuildInputs = [ pr2-controllers-msgs pr2-mechanism-controllers actionlib-msgs robot-mechanism-controllers actionlib roscpp pr2-mechanism-model ]; nativeBuildInputs = [ catkin ]; meta = { @@ -21,6 +21,6 @@ buildRosPackage { gripper. Users can specify what position to move to (while limiting the force) and the action will report success when the position is reached or failure when the gripper cannot move any longer.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-hardware-interface/default.nix b/melodic/pr2-hardware-interface/default.nix index 91cb65df5d..956f63bd87 100644 --- a/melodic/pr2-hardware-interface/default.nix +++ b/melodic/pr2-hardware-interface/default.nix @@ -24,6 +24,6 @@ buildRosPackage { triggers, etc... All of the hardware components in this interface are directly available to the controllers inside the hard realtime control loop.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-head-action/default.nix b/melodic/pr2-head-action/default.nix index 65f964f841..31c1458ffd 100644 --- a/melodic/pr2-head-action/default.nix +++ b/melodic/pr2-head-action/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''The PR2 head action is a node that provides an action interface for pointing the head of the PR2. It passes trajectory goals to the controller, and reports success when they have finished executing.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-kinematics/default.nix b/melodic/pr2-kinematics/default.nix index 9b8d15e586..d551f030dd 100644 --- a/melodic/pr2-kinematics/default.nix +++ b/melodic/pr2-kinematics/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The pr2_kinematics package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-machine/default.nix b/melodic/pr2-machine/default.nix index 98ee3a9559..f74b8b336d 100644 --- a/melodic/pr2-machine/default.nix +++ b/melodic/pr2-machine/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''This package contains the xxx.machine files that describe the different hosts a node can be spawned on. Currently there is one machine file for the pr2 robot, and one for the simulated pr2 robot.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-mannequin-mode/default.nix b/melodic/pr2-mannequin-mode/default.nix index d7658f6e66..c97b683774 100644 --- a/melodic/pr2-mannequin-mode/default.nix +++ b/melodic/pr2-mannequin-mode/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The pr2_mannequin_mode package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-mechanism-controllers/default.nix b/melodic/pr2-mechanism-controllers/default.nix index 84bfef07c0..93518a9360 100644 --- a/melodic/pr2-mechanism-controllers/default.nix +++ b/melodic/pr2-mechanism-controllers/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "890a0f35fb6cc047e87cc265a82e5e54988d7095db41b53f4182590b434ed6ec"; }; - buildInputs = [ pr2-controllers-msgs pr2-mechanism-msgs filters rosconsole robot-mechanism-controllers nav-msgs rospy std-msgs diagnostic-msgs roscpp tf pr2-mechanism-model visualization-msgs geometry-msgs pr2-controller-interface pluginlib control-toolbox realtime-tools diagnostic-updater message-generation angles pr2-msgs ]; - propagatedBuildInputs = [ pr2-controllers-msgs pr2-mechanism-msgs filters rosconsole robot-mechanism-controllers nav-msgs rospy std-msgs diagnostic-msgs roscpp tf pr2-mechanism-model visualization-msgs geometry-msgs pr2-controller-interface pluginlib control-toolbox realtime-tools diagnostic-updater message-runtime angles pr2-msgs ]; + buildInputs = [ filters rosconsole rospy diagnostic-msgs tf geometry-msgs realtime-tools message-generation angles pr2-msgs pr2-controllers-msgs pr2-mechanism-msgs robot-mechanism-controllers nav-msgs std-msgs roscpp visualization-msgs pr2-mechanism-model pr2-controller-interface pluginlib control-toolbox diagnostic-updater ]; + propagatedBuildInputs = [ filters rosconsole rospy diagnostic-msgs tf geometry-msgs realtime-tools message-runtime angles pr2-msgs pr2-controllers-msgs pr2-mechanism-msgs robot-mechanism-controllers nav-msgs std-msgs roscpp visualization-msgs pr2-mechanism-model pr2-controller-interface pluginlib control-toolbox diagnostic-updater ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The pr2_mechanism_controllers package contains realtime controllers that are meant for specific mechanisms of the PR2.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-mechanism-diagnostics/default.nix b/melodic/pr2-mechanism-diagnostics/default.nix index 2a30e6698d..02266a25a1 100644 --- a/melodic/pr2-mechanism-diagnostics/default.nix +++ b/melodic/pr2-mechanism-diagnostics/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ pr2-mechanism-msgs std-srvs diagnostic-updater rostest urdf angles std-msgs diagnostic-msgs roscpp pr2-mechanism-model ]; - propagatedBuildInputs = [ pr2-mechanism-msgs std-srvs diagnostic-updater std-msgs urdf angles rospy diagnostic-msgs roscpp pr2-mechanism-model ]; + propagatedBuildInputs = [ pr2-mechanism-msgs angles std-srvs diagnostic-updater urdf rospy std-msgs diagnostic-msgs roscpp pr2-mechanism-model ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The `pr2_mechanism_diagnostics` node subscribes to `mechanism_statistics` and publishes diagnostics data for joints and controllers on `/diagnostics`.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-mechanism-model/default.nix b/melodic/pr2-mechanism-model/default.nix index cf0a4f2305..0f964e34e1 100644 --- a/melodic/pr2-mechanism-model/default.nix +++ b/melodic/pr2-mechanism-model/default.nix @@ -13,7 +13,7 @@ buildRosPackage { }; buildInputs = [ hardware-interface kdl-parser cmake-modules pluginlib pr2-hardware-interface urdfdom rostest urdf angles roscpp rosunit ]; - propagatedBuildInputs = [ hardware-interface kdl-parser pluginlib urdf angles pr2-hardware-interface roscpp urdfdom ]; + propagatedBuildInputs = [ hardware-interface kdl-parser pluginlib pr2-hardware-interface urdfdom urdf angles roscpp ]; nativeBuildInputs = [ catkin ]; meta = { @@ -30,6 +30,6 @@ buildRosPackage {

    The pr2_mechanism_model package is well tested and is released with a stable API.

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-mechanism-msgs/default.nix b/melodic/pr2-mechanism-msgs/default.nix index e2157c25f6..fa6256179a 100644 --- a/melodic/pr2-mechanism-msgs/default.nix +++ b/melodic/pr2-mechanism-msgs/default.nix @@ -21,6 +21,6 @@ buildRosPackage { the realtime control loop. It also defines messages that represent the state of the realtime controllers, the joints and the actuators.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-mechanism/default.nix b/melodic/pr2-mechanism/default.nix index 953765a1cc..cde4578aad 100644 --- a/melodic/pr2-mechanism/default.nix +++ b/melodic/pr2-mechanism/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "c6ed5bf479132aac212fc57681dc0223a03708b808e2ee0c0c8c27318348f468"; }; - propagatedBuildInputs = [ pr2-controller-manager pr2-hardware-interface pr2-controller-interface pr2-mechanism-diagnostics pr2-mechanism-model ]; + propagatedBuildInputs = [ pr2-hardware-interface pr2-controller-interface pr2-mechanism-diagnostics pr2-controller-manager pr2-mechanism-model ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The pr2_mechanism stack contains the infrastructure to control the PR2 robot in a hard realtime control loop.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-msgs/default.nix b/melodic/pr2-msgs/default.nix index ffd47aae0c..7ac7ca5dd1 100644 --- a/melodic/pr2-msgs/default.nix +++ b/melodic/pr2-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-position-scripts/default.nix b/melodic/pr2-position-scripts/default.nix index f59d80e764..f4da8ecd09 100644 --- a/melodic/pr2-position-scripts/default.nix +++ b/melodic/pr2-position-scripts/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains a number of scripts to set various components of the PR2. They are used in the apps to improve usablity.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-power-board/default.nix b/melodic/pr2-power-board/default.nix index 44d5dbca3e..01a855d3bb 100644 --- a/melodic/pr2-power-board/default.nix +++ b/melodic/pr2-power-board/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This provides a ROS node for the PR2 Power Board.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-power-drivers/default.nix b/melodic/pr2-power-drivers/default.nix index 3b73e9ffc4..a4c2d380a1 100644 --- a/melodic/pr2-power-drivers/default.nix +++ b/melodic/pr2-power-drivers/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Power drivers for the PR2 robot.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-simulator/default.nix b/melodic/pr2-simulator/default.nix index 1f8925bb0a..a6a9cd5718 100644 --- a/melodic/pr2-simulator/default.nix +++ b/melodic/pr2-simulator/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The pr2_simulator package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-teleop-general/default.nix b/melodic/pr2-teleop-general/default.nix index 1f86ef65aa..43abda3628 100644 --- a/melodic/pr2-teleop-general/default.nix +++ b/melodic/pr2-teleop-general/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ pr2-controllers-msgs pr2-mechanism-msgs ps3joy angles actionlib-msgs pr2-common-action-msgs sensor-msgs polled-camera roscpp pr2-controller-manager urdf actionlib moveit-msgs pr2-msgs tf geometry-msgs ]; - propagatedBuildInputs = [ pr2-controllers-msgs pr2-mechanism-msgs ps3joy actionlib-msgs pr2-common-action-msgs polled-camera urdf actionlib moveit-msgs roscpp tf pr2-arm-kinematics geometry-msgs sensor-msgs pr2-mannequin-mode pr2-msgs pr2-controller-manager angles pr2-tuck-arms-action ]; + propagatedBuildInputs = [ actionlib-msgs polled-camera actionlib tf geometry-msgs pr2-controller-manager angles pr2-msgs pr2-controllers-msgs pr2-mechanism-msgs ps3joy pr2-common-action-msgs urdf moveit-msgs roscpp pr2-arm-kinematics sensor-msgs pr2-mannequin-mode pr2-tuck-arms-action ]; nativeBuildInputs = [ catkin ]; meta = { description = ''pr2_teleop_general''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-teleop/default.nix b/melodic/pr2-teleop/default.nix index 91ff810aec..5d5d6a7c6f 100644 --- a/melodic/pr2-teleop/default.nix +++ b/melodic/pr2-teleop/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, pr2-controllers-msgs, tf, catkin, std-msgs, actionlib, rospy, topic-tools, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, pr2-controllers-msgs, tf, catkin, rospy, std-msgs, actionlib, topic-tools, roscpp, geometry-msgs }: buildRosPackage { pname = "ros-melodic-pr2-teleop"; version = "0.6.1"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "58621f94cdf383410e0b4e896be17b09320461196422f8e14e28e19a58680625"; }; - buildInputs = [ pr2-controllers-msgs actionlib std-msgs geometry-msgs tf topic-tools roscpp rospy ]; - propagatedBuildInputs = [ pr2-controllers-msgs actionlib std-msgs geometry-msgs tf topic-tools roscpp rospy ]; + buildInputs = [ pr2-controllers-msgs topic-tools roscpp actionlib rospy std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ pr2-controllers-msgs topic-tools roscpp actionlib rospy std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The pr2_teleop package''; - #license = lib.licenses.TODO; + license = with lib.licenses; [ "TODO" ]; }; } diff --git a/melodic/pr2-tilt-laser-interface/default.nix b/melodic/pr2-tilt-laser-interface/default.nix index cc30c0f0d4..b7b12d84d6 100644 --- a/melodic/pr2-tilt-laser-interface/default.nix +++ b/melodic/pr2-tilt-laser-interface/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "8d25bddf370f8550b5ddac3e38c98c17d4880893c20bc601f8fd8b86c5bc4c2c"; }; - buildInputs = [ actionlib-msgs pcl-conversions sensor-msgs roscpp message-generation actionlib pr2-msgs laser-geometry pcl-ros eigen ]; - propagatedBuildInputs = [ actionlib-msgs pcl-conversions sensor-msgs roscpp message-runtime actionlib pr2-msgs laser-geometry pcl-ros eigen ]; + buildInputs = [ actionlib-msgs sensor-msgs roscpp message-generation actionlib pcl-ros pr2-msgs laser-geometry pcl-conversions eigen ]; + propagatedBuildInputs = [ actionlib-msgs sensor-msgs roscpp actionlib message-runtime pcl-ros pr2-msgs laser-geometry pcl-conversions eigen ]; nativeBuildInputs = [ catkin ]; meta = { @@ -21,6 +21,6 @@ buildRosPackage { laser. Simplifies previously complex tasks, such as fetching a single sweep, given a set of desired parameters for both the laser driver and tilting platform.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-tuck-arms-action/default.nix b/melodic/pr2-tuck-arms-action/default.nix index 309bdcceeb..ac5500fbbd 100644 --- a/melodic/pr2-tuck-arms-action/default.nix +++ b/melodic/pr2-tuck-arms-action/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "12d791a5cb70ca8bce9093e6dddc5cd0fc718b1d440f62c6006071bd736629e7"; }; - buildInputs = [ pr2-controllers-msgs actionlib actionlib-msgs rospy pr2-common-action-msgs trajectory-msgs ]; - propagatedBuildInputs = [ pr2-controllers-msgs actionlib actionlib-msgs rospy pr2-common-action-msgs trajectory-msgs ]; + buildInputs = [ pr2-controllers-msgs actionlib-msgs pr2-common-action-msgs trajectory-msgs actionlib rospy ]; + propagatedBuildInputs = [ pr2-controllers-msgs actionlib-msgs pr2-common-action-msgs trajectory-msgs actionlib rospy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The pr2_tuck_arms_action package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pr2-tuckarm/default.nix b/melodic/pr2-tuckarm/default.nix index 1f6510bc8c..2c9a77616f 100644 --- a/melodic/pr2-tuckarm/default.nix +++ b/melodic/pr2-tuckarm/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Tucks the arms of the PR2 robot into a safe position for moving the base of the robot. This also moves the arms out of the view of the tilting laser scanner, as much as possible.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/prbt-gazebo/default.nix b/melodic/prbt-gazebo/default.nix index bad763b555..d2ad88e0cd 100644 --- a/melodic/prbt-gazebo/default.nix +++ b/melodic/prbt-gazebo/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Launch prbt robot in an empty Gazebo world.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/prbt-grippers/default.nix b/melodic/prbt-grippers/default.nix index 80da2bf930..d5f9545fc2 100644 --- a/melodic/prbt-grippers/default.nix +++ b/melodic/prbt-grippers/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The package provides gripper support for the pilz_robots package.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/prbt-hardware-support/default.nix b/melodic/prbt-hardware-support/default.nix index 76f14d4124..36d77997f6 100644 --- a/melodic/prbt-hardware-support/default.nix +++ b/melodic/prbt-hardware-support/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "8833ee4869bd8c34bf8d4b9d76ec465235de9121403da7989ed73c31f648d5f0"; }; - buildInputs = [ std-srvs message-generation libmodbus std-msgs roscpp message-filters ]; - checkInputs = [ rostest cmake-modules pilz-testutils code-coverage rosunit ]; + buildInputs = [ std-srvs libmodbus message-filters message-generation std-msgs roscpp ]; + checkInputs = [ cmake-modules pilz-testutils rostest code-coverage rosunit ]; propagatedBuildInputs = [ std-msgs std-srvs roscpp message-runtime ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Control hardware functions of the PRBT manipulator like STO for Stop1 functionality.''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/prbt-ikfast-manipulator-plugin/default.nix b/melodic/prbt-ikfast-manipulator-plugin/default.nix index 9029440d73..6d4e75dbe7 100644 --- a/melodic/prbt-ikfast-manipulator-plugin/default.nix +++ b/melodic/prbt-ikfast-manipulator-plugin/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "def4ff61fb9b4e80534735517fdada554eb01572558047e6b7c840f923c77766"; }; - buildInputs = [ liblapack moveit-core pluginlib roscpp tf2-kdl ]; + buildInputs = [ pluginlib tf2-kdl liblapack moveit-core roscpp ]; checkInputs = [ rostest code-coverage rosunit ]; - propagatedBuildInputs = [ liblapack moveit-core pluginlib roscpp tf2-kdl ]; + propagatedBuildInputs = [ pluginlib tf2-kdl liblapack moveit-core roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The prbt_ikfast_manipulator_plugin package''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/prbt-moveit-config/default.nix b/melodic/prbt-moveit-config/default.nix index 305f7b3a34..f49ccb4c03 100644 --- a/melodic/prbt-moveit-config/default.nix +++ b/melodic/prbt-moveit-config/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''An automatically generated package with all the configuration and launch files for using the prbt with the MoveIt! Motion Planning Framework''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/prbt-pg70-support/default.nix b/melodic/prbt-pg70-support/default.nix index 7aef070415..4e734a6a72 100644 --- a/melodic/prbt-pg70-support/default.nix +++ b/melodic/prbt-pg70-support/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, prbt-support, prbt-moveit-config, schunk-description, prbt-ikfast-manipulator-plugin, catkin, xacro }: +{ lib, buildRosPackage, fetchurl, prbt-support, prbt-moveit-config, xacro, schunk-description, catkin, prbt-ikfast-manipulator-plugin }: buildRosPackage { pname = "ros-melodic-prbt-pg70-support"; version = "0.0.3-r1"; @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''PRBT support for Schunk pg70 gripper.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/prbt-support/default.nix b/melodic/prbt-support/default.nix index f1a358a731..3813d3b988 100644 --- a/melodic/prbt-support/default.nix +++ b/melodic/prbt-support/default.nix @@ -13,13 +13,13 @@ buildRosPackage { }; buildInputs = [ roscpp ]; - checkInputs = [ rostest cmake-modules moveit-core eigen roslaunch moveit-kinematics ]; + checkInputs = [ cmake-modules moveit-kinematics rostest moveit-core eigen roslaunch ]; propagatedBuildInputs = [ controller-manager joint-state-controller pilz-control prbt-hardware-support rosservice canopen-motor-node rviz robot-state-publisher topic-tools roscpp joint-state-publisher xacro ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Mechanical, kinematic and visual description of the Pilz light weight arm PRBT.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/prosilica-camera/default.nix b/melodic/prosilica-camera/default.nix index 174e2d8f44..28589a08d3 100644 --- a/melodic/prosilica-camera/default.nix +++ b/melodic/prosilica-camera/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''A ROS driver node for AVT/Prosilica Gigabit Ethernet (GigE) cameras.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/prosilica-gige-sdk/default.nix b/melodic/prosilica-gige-sdk/default.nix index 0e5f021c24..0395c48514 100644 --- a/melodic/prosilica-gige-sdk/default.nix +++ b/melodic/prosilica-gige-sdk/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''AVT GigE SDK version 1.26 for ROS''; - #license = lib.licenses.Commercial; + license = with lib.licenses; [ "Commercial" ]; }; } diff --git a/melodic/ps3joy/default.nix b/melodic/ps3joy/default.nix index b11def9a0f..3c0720f520 100644 --- a/melodic/ps3joy/default.nix +++ b/melodic/ps3joy/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, bluez, sensor-msgs, linuxConsoleTools, pythonPackages, catkin, rosgraph, rospy, diagnostic-msgs, libusb }: +{ lib, buildRosPackage, fetchurl, bluez, sensor-msgs, linuxConsoleTools, pythonPackages, catkin, rosgraph, libusb, rospy, diagnostic-msgs }: buildRosPackage { pname = "ros-melodic-ps3joy"; version = "1.12.0"; @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "c3b9aa3c6b572091d412fa7e2904b1c799471ba99aed7dd1b906f2b9e35b0f2a"; }; - buildInputs = [ rosgraph pythonPackages.pybluez libusb bluez diagnostic-msgs sensor-msgs linuxConsoleTools rospy ]; - propagatedBuildInputs = [ rosgraph pythonPackages.pybluez libusb bluez diagnostic-msgs sensor-msgs linuxConsoleTools rospy ]; + buildInputs = [ bluez sensor-msgs linuxConsoleTools pythonPackages.pybluez rosgraph libusb rospy diagnostic-msgs ]; + propagatedBuildInputs = [ bluez sensor-msgs linuxConsoleTools pythonPackages.pybluez rosgraph libusb rospy diagnostic-msgs ]; nativeBuildInputs = [ catkin ]; meta = { @@ -24,6 +24,6 @@ buildRosPackage { for a connection on the HID ports, starts the joystick streaming data, and passes the data to the Linux uinput device so that it shows up as a normal joystick.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/py-trees-msgs/default.nix b/melodic/py-trees-msgs/default.nix index a6b22b06ec..402a1c8c07 100644 --- a/melodic/py-trees-msgs/default.nix +++ b/melodic/py-trees-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "71d8d3b25202546af7f8f085a532d72bf3fc35a591958d88927c6506571f3b37"; }; - buildInputs = [ uuid-msgs message-generation actionlib-msgs dynamic-reconfigure std-msgs ]; - propagatedBuildInputs = [ uuid-msgs message-runtime actionlib-msgs dynamic-reconfigure std-msgs ]; + buildInputs = [ actionlib-msgs uuid-msgs message-generation dynamic-reconfigure std-msgs ]; + propagatedBuildInputs = [ actionlib-msgs uuid-msgs message-runtime dynamic-reconfigure std-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Messages used by py_trees_ros and some extras for the mock demos/tests.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/py-trees-ros/default.nix b/melodic/py-trees-ros/default.nix index f8417009e7..33e03fd7b2 100644 --- a/melodic/py-trees-ros/default.nix +++ b/melodic/py-trees-ros/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Ros extensions and behaviours for py_trees.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/py-trees/default.nix b/melodic/py-trees/default.nix index 45fc0238e6..13f2fcf125 100644 --- a/melodic/py-trees/default.nix +++ b/melodic/py-trees/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Pythonic implementation of behaviour trees.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/pybind11-catkin/default.nix b/melodic/pybind11-catkin/default.nix index a62b51c567..b0c9545af6 100644 --- a/melodic/pybind11-catkin/default.nix +++ b/melodic/pybind11-catkin/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The pybind11 package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/python-orocos-kdl/default.nix b/melodic/python-orocos-kdl/default.nix index fd889a71a2..d6a3e507bf 100644 --- a/melodic/python-orocos-kdl/default.nix +++ b/melodic/python-orocos-kdl/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains the python bindings PyKDL for the Kinematics and Dynamics Library (KDL), distributed by the Orocos Project.''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/python-qt-binding/default.nix b/melodic/python-qt-binding/default.nix index 9b7f0fca4c..1c7a9d2758 100644 --- a/melodic/python-qt-binding/default.nix +++ b/melodic/python-qt-binding/default.nix @@ -28,6 +28,6 @@ buildRosPackage { Also provided is adapter code to make the user's Python code independent of which binding provider was actually used which makes it very easy to switch between these.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-chain-control/default.nix b/melodic/qb-chain-control/default.nix index 601ec71b05..5fc4e26f4c 100644 --- a/melodic/qb-chain-control/default.nix +++ b/melodic/qb-chain-control/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS node to control multiple qbrobotics® devices simultaneously.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-chain-description/default.nix b/melodic/qb-chain-description/default.nix index e6855780f2..c774a546a1 100644 --- a/melodic/qb-chain-description/default.nix +++ b/melodic/qb-chain-description/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS description for complex chains of qbrobotics® devices.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-chain/default.nix b/melodic/qb-chain/default.nix index a4da80eda0..b412995ce7 100644 --- a/melodic/qb-chain/default.nix +++ b/melodic/qb-chain/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS interface to control multiple qbrobotics® devices simultaneously.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-device-bringup/default.nix b/melodic/qb-device-bringup/default.nix index 4ce7bc761a..34b6ac7c95 100644 --- a/melodic/qb-device-bringup/default.nix +++ b/melodic/qb-device-bringup/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''This package contains a device-independent bringup utilities for qbrobotics® devices.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-device-control/default.nix b/melodic/qb-device-control/default.nix index f7a73c8e56..a681854545 100644 --- a/melodic/qb-device-control/default.nix +++ b/melodic/qb-device-control/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "aa15f86f450ad62174010eae97ce5ba325a52e62a638a01ae3b7a100ec406a6b"; }; - buildInputs = [ controller-manager combined-robot-hw actionlib qb-device-hardware-interface control-msgs roscpp qb-device-utils ]; - propagatedBuildInputs = [ controller-manager combined-robot-hw actionlib qb-device-hardware-interface control-msgs roscpp qb-device-utils ]; + buildInputs = [ controller-manager control-msgs combined-robot-hw actionlib qb-device-hardware-interface roscpp qb-device-utils ]; + propagatedBuildInputs = [ controller-manager control-msgs combined-robot-hw actionlib qb-device-hardware-interface roscpp qb-device-utils ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package contains a device-independent control library for qbrobotics® devices.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-device-description/default.nix b/melodic/qb-device-description/default.nix index 81afe8946b..0e545cc75d 100644 --- a/melodic/qb-device-description/default.nix +++ b/melodic/qb-device-description/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''This package contains a device-independent description utilities for qbrobotics® devices.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-device-driver/default.nix b/melodic/qb-device-driver/default.nix index 4e8b6ff9b6..9157aca7b2 100644 --- a/melodic/qb-device-driver/default.nix +++ b/melodic/qb-device-driver/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains a device-independent API wrapper for qbrobotics® devices.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-device-hardware-interface/default.nix b/melodic/qb-device-hardware-interface/default.nix index 5ec67281fe..41a54b20fd 100644 --- a/melodic/qb-device-hardware-interface/default.nix +++ b/melodic/qb-device-hardware-interface/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "16e0d28b4e8b145ae272049cdf232830fd7e6ffc50145bcb04a1570fa1e0f791"; }; - buildInputs = [ hardware-interface urdf qb-device-msgs qb-device-srvs roscpp joint-limits-interface transmission-interface ]; + buildInputs = [ hardware-interface joint-limits-interface urdf qb-device-msgs qb-device-srvs roscpp transmission-interface ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ hardware-interface urdf qb-device-msgs qb-device-srvs roscpp joint-limits-interface transmission-interface ]; + propagatedBuildInputs = [ hardware-interface joint-limits-interface urdf qb-device-msgs qb-device-srvs roscpp transmission-interface ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package contains a device-independent hardware interface for qbrobotics® devices.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-device-msgs/default.nix b/melodic/qb-device-msgs/default.nix index 17a7c95b01..b673145d3a 100644 --- a/melodic/qb-device-msgs/default.nix +++ b/melodic/qb-device-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the device-independent custom ROS messages for qbrobotics® devices.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-device-srvs/default.nix b/melodic/qb-device-srvs/default.nix index e2ab17732d..991db99b94 100644 --- a/melodic/qb-device-srvs/default.nix +++ b/melodic/qb-device-srvs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the device-independent custom ROS services for qbrobotics® devices.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-device-utils/default.nix b/melodic/qb-device-utils/default.nix index 7a2d640954..ce8fdc2925 100644 --- a/melodic/qb-device-utils/default.nix +++ b/melodic/qb-device-utils/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains a device-independent utility functions for qbrobotics® devices.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-device/default.nix b/melodic/qb-device/default.nix index 7d1826a035..cfd7bacc62 100644 --- a/melodic/qb-device/default.nix +++ b/melodic/qb-device/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "732baae03ff35decece845d122f21d7b7b86d2c31f726cfce269be208c306724"; }; - propagatedBuildInputs = [ qb-device-bringup qb-device-msgs qb-device-srvs qb-device-description qb-device-driver qb-device-control qb-device-hardware-interface ]; + propagatedBuildInputs = [ qb-device-bringup qb-device-description qb-device-msgs qb-device-srvs qb-device-driver qb-device-control qb-device-hardware-interface ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package contains a device-independent ROS interface for qbrobotics® devices.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-hand-control/default.nix b/melodic/qb-hand-control/default.nix index e8c2945d6c..0a325a1a52 100644 --- a/melodic/qb-hand-control/default.nix +++ b/melodic/qb-hand-control/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS control node for qbrobotics® qbhand device.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-hand-description/default.nix b/melodic/qb-hand-description/default.nix index 5fc8e12c04..9929b86719 100644 --- a/melodic/qb-hand-description/default.nix +++ b/melodic/qb-hand-description/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS description for qbrobotics® qbhand device.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-hand-hardware-interface/default.nix b/melodic/qb-hand-hardware-interface/default.nix index 581205a9cd..c530c8de94 100644 --- a/melodic/qb-hand-hardware-interface/default.nix +++ b/melodic/qb-hand-hardware-interface/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, hardware-interface, control-toolbox, catkin, qb-device-hardware-interface, roscpp, transmission-interface }: +{ lib, buildRosPackage, fetchurl, hardware-interface, control-toolbox, catkin, transmission-interface, roscpp, qb-device-hardware-interface }: buildRosPackage { pname = "ros-melodic-qb-hand-hardware-interface"; version = "2.0.0-r1"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "88138eb2c19395bcb633d026f37a60414f12797a08392c17d9cb967f13bef9c5"; }; - buildInputs = [ hardware-interface transmission-interface control-toolbox roscpp qb-device-hardware-interface ]; - propagatedBuildInputs = [ hardware-interface transmission-interface control-toolbox roscpp qb-device-hardware-interface ]; + buildInputs = [ hardware-interface control-toolbox transmission-interface roscpp qb-device-hardware-interface ]; + propagatedBuildInputs = [ hardware-interface control-toolbox transmission-interface roscpp qb-device-hardware-interface ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package contains the hardware interface for qbrobotics® qbhand device.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-hand/default.nix b/melodic/qb-hand/default.nix index 1a73a741a8..d966d14c87 100644 --- a/melodic/qb-hand/default.nix +++ b/melodic/qb-hand/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS interface for qbrobotics® qbhand device.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-move-control/default.nix b/melodic/qb-move-control/default.nix index caf4001eb9..39f62593c9 100644 --- a/melodic/qb-move-control/default.nix +++ b/melodic/qb-move-control/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS control node for qbrobotics® qbmove device.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-move-description/default.nix b/melodic/qb-move-description/default.nix index 8192386fb6..1969711b0f 100644 --- a/melodic/qb-move-description/default.nix +++ b/melodic/qb-move-description/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS description for qbrobotics® qbmove device.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-move-hardware-interface/default.nix b/melodic/qb-move-hardware-interface/default.nix index d1aaade3d9..8250edb94e 100644 --- a/melodic/qb-move-hardware-interface/default.nix +++ b/melodic/qb-move-hardware-interface/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, hardware-interface, control-toolbox, catkin, qb-device-hardware-interface, roscpp, transmission-interface }: +{ lib, buildRosPackage, fetchurl, hardware-interface, control-toolbox, catkin, transmission-interface, roscpp, qb-device-hardware-interface }: buildRosPackage { pname = "ros-melodic-qb-move-hardware-interface"; version = "2.0.0-r1"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "f286bcac0739c1e7f8572d5e8abd413d25b541e3d54efa3b9805482543cd9c97"; }; - buildInputs = [ hardware-interface transmission-interface control-toolbox roscpp qb-device-hardware-interface ]; - propagatedBuildInputs = [ hardware-interface transmission-interface control-toolbox roscpp qb-device-hardware-interface ]; + buildInputs = [ hardware-interface control-toolbox transmission-interface roscpp qb-device-hardware-interface ]; + propagatedBuildInputs = [ hardware-interface control-toolbox transmission-interface roscpp qb-device-hardware-interface ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package contains the hardware interface for qbrobotics® qbmove device.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qb-move/default.nix b/melodic/qb-move/default.nix index 3bd8598a38..476d8383c3 100644 --- a/melodic/qb-move/default.nix +++ b/melodic/qb-move/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS interface for qbrobotics® qbmove device.''; - #license = lib.licenses.BSD 3-Clause; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qt-dotgraph/default.nix b/melodic/qt-dotgraph/default.nix index 3c5986c82e..0bf112c422 100644 --- a/melodic/qt-dotgraph/default.nix +++ b/melodic/qt-dotgraph/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''qt_dotgraph provides helpers to work with dot graphs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qt-gui-app/default.nix b/melodic/qt-gui-app/default.nix index c0bff2401c..e2f87492b1 100644 --- a/melodic/qt-gui-app/default.nix +++ b/melodic/qt-gui-app/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''qt_gui_app provides the main to start an instance of the integrated graphical user interface provided by qt_gui.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qt-gui-core/default.nix b/melodic/qt-gui-core/default.nix index e2a6f5ad51..b4c0d6d9c9 100644 --- a/melodic/qt-gui-core/default.nix +++ b/melodic/qt-gui-core/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "c49816fb690393c749f341c95ac6e0ee7000121701ea3ec5597297712d90aa9a"; }; - propagatedBuildInputs = [ qt-gui-cpp qt-gui-app qt-gui qt-dotgraph qt-gui-py-common ]; + propagatedBuildInputs = [ qt-gui-app qt-gui-cpp qt-gui qt-dotgraph qt-gui-py-common ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Integration of the ROS package system and ROS-specific plugins for a Qt-based GUI.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qt-gui-cpp/default.nix b/melodic/qt-gui-cpp/default.nix index 2ab94a983d..0df8b1cdfe 100644 --- a/melodic/qt-gui-cpp/default.nix +++ b/melodic/qt-gui-cpp/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "fbbba01e82d3c63dfeab0fdc9caac8916de97295a8e8c08e715dc965e69dc545"; }; - buildInputs = [ qt5.qtbase cmake-modules pluginlib python-qt-binding tinyxml pkg-config ]; + buildInputs = [ cmake-modules pluginlib tinyxml pkg-config qt5.qtbase python-qt-binding ]; propagatedBuildInputs = [ pluginlib qt-gui tinyxml ]; nativeBuildInputs = [ catkin ]; meta = { description = ''qt_gui_cpp provides the foundation for C++-bindings for qt_gui and creates bindings for every generator available. At least one specific binding must be available in order to use C++-plugins.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qt-gui-py-common/default.nix b/melodic/qt-gui-py-common/default.nix index 30a5494838..0ebea0d835 100644 --- a/melodic/qt-gui-py-common/default.nix +++ b/melodic/qt-gui-py-common/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''qt_gui_py_common provides common functionality for GUI plugins written in Python.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qt-gui/default.nix b/melodic/qt-gui/default.nix index 75b95e565c..47e9f66973 100644 --- a/melodic/qt-gui/default.nix +++ b/melodic/qt-gui/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''qt_gui provides the infrastructure for an integrated graphical user interface based on Qt. It is extensible with Python- and C++-based plugins (implemented in separate packages) which can contribute arbitrary widgets. It requires either PyQt or PySide bindings.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/qt-qmake/default.nix b/melodic/qt-qmake/default.nix index b97278f69b..6d69b41abb 100644 --- a/melodic/qt-qmake/default.nix +++ b/melodic/qt-qmake/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''qt*-qmake metapackage supporting qt4 and qt5''; - #license = lib.licenses.United States Government Purpose; + license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; }; } diff --git a/melodic/quaternion-operation/default.nix b/melodic/quaternion-operation/default.nix index 8f3bee02f7..8dc0319e91 100644 --- a/melodic/quaternion-operation/default.nix +++ b/melodic/quaternion-operation/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The quaternion_operation package''; - #license = lib.licenses.Aoache v2; + license = with lib.licenses; [ "Aoache v2" ]; }; } diff --git a/melodic/qwt-dependency/default.nix b/melodic/qwt-dependency/default.nix index 23e24400be..f479f2ca18 100644 --- a/melodic/qwt-dependency/default.nix +++ b/melodic/qwt-dependency/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''This encapsulates the Qwt dependency for a specific ROS distribution and its Qt version''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/radar-msgs/default.nix b/melodic/radar-msgs/default.nix index 574acbc5d9..6f2da313b2 100644 --- a/melodic/radar-msgs/default.nix +++ b/melodic/radar-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Generic Radar Messages''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/radar-omnipresense/default.nix b/melodic/radar-omnipresense/default.nix index aafb99c24a..f270bfb01a 100644 --- a/melodic/radar-omnipresense/default.nix +++ b/melodic/radar-omnipresense/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This is the radar driver package developed for the omnipresense radar module.''; - #license = lib.licenses.ECL2.0; + license = with lib.licenses; [ "ECL2.0" ]; }; } diff --git a/melodic/rail-manipulation-msgs/default.nix b/melodic/rail-manipulation-msgs/default.nix index 4553119339..6ac92eaeca 100644 --- a/melodic/rail-manipulation-msgs/default.nix +++ b/melodic/rail-manipulation-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "2d8effa0a61ce81ef4a037ce360defc578616e2b6e5c1981144ba08e89dbd473"; }; - buildInputs = [ message-generation actionlib-msgs sensor-msgs visualization-msgs geometry-msgs ]; - propagatedBuildInputs = [ message-runtime actionlib-msgs sensor-msgs visualization-msgs geometry-msgs ]; + buildInputs = [ actionlib-msgs sensor-msgs message-generation visualization-msgs geometry-msgs ]; + propagatedBuildInputs = [ actionlib-msgs sensor-msgs message-runtime visualization-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Common Manipulation Messages and Services Used in RAIL Manipulation Packages''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/random-numbers/default.nix b/melodic/random-numbers/default.nix index 8d3eee87a6..3ed9235b13 100644 --- a/melodic/random-numbers/default.nix +++ b/melodic/random-numbers/default.nix @@ -21,6 +21,6 @@ buildRosPackage { The constructor of the wrapper is guaranteed to be thread safe and initialize its random number generator to a random seed. Seeds are obtained using a separate and different random number generator.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/range-sensor-layer/default.nix b/melodic/range-sensor-layer/default.nix index 601e47e110..2d68a881d4 100644 --- a/melodic/range-sensor-layer/default.nix +++ b/melodic/range-sensor-layer/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, costmap-2d, pluginlib, roslint, sensor-msgs, catkin, dynamic-reconfigure, rospy, angles, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, costmap-2d, pluginlib, roslint, sensor-msgs, catkin, rospy, angles, dynamic-reconfigure, roscpp, geometry-msgs }: buildRosPackage { pname = "ros-melodic-range-sensor-layer"; version = "0.5.0"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "8e94872327b9579a9ca65c6aefe659bfffb7544a61ddca67580e8707af85d2e7"; }; - buildInputs = [ costmap-2d dynamic-reconfigure pluginlib angles rospy sensor-msgs roscpp geometry-msgs ]; + buildInputs = [ costmap-2d pluginlib sensor-msgs rospy angles dynamic-reconfigure roscpp geometry-msgs ]; checkInputs = [ roslint ]; - propagatedBuildInputs = [ costmap-2d dynamic-reconfigure pluginlib angles rospy sensor-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ costmap-2d pluginlib sensor-msgs rospy angles dynamic-reconfigure roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Navigation Layer for Range sensors like sonar and IR''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/raw-description/default.nix b/melodic/raw-description/default.nix index 6ea465c796..cbf0d14fab 100644 --- a/melodic/raw-description/default.nix +++ b/melodic/raw-description/default.nix @@ -20,6 +20,6 @@ buildRosPackage { etc.) of the Care-O-bot robot. The files in this package are parsed and used by a variety of other components. Most users will not interact directly with this package.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/rc-cloud-accumulator/default.nix b/melodic/rc-cloud-accumulator/default.nix index 3e40770f86..fb50f2f017 100644 --- a/melodic/rc-cloud-accumulator/default.nix +++ b/melodic/rc-cloud-accumulator/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''A viewer for the SLAM component of roboception based on ROS and PCL''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rc-common-msgs/default.nix b/melodic/rc-common-msgs/default.nix new file mode 100644 index 0000000000..412a25e259 --- /dev/null +++ b/melodic/rc-common-msgs/default.nix @@ -0,0 +1,23 @@ + +# Copyright 2019 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, message-generation, catkin, message-runtime }: +buildRosPackage { + pname = "ros-melodic-rc-common-msgs"; + version = "0.2.1-r1"; + + src = fetchurl { + url = https://github.com/roboception-gbp/rc_common_msgs-release/archive/release/melodic/rc_common_msgs/0.2.1-1.tar.gz; + sha256 = "0510e2724b20be04c132d6218f0e411382934c9ebb5c5f8254b87b8db903f3ce"; + }; + + buildInputs = [ message-generation ]; + propagatedBuildInputs = [ message-runtime ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Common msg and srv definitions used by Roboception's ROS packages''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/melodic/rc-dynamics-api/default.nix b/melodic/rc-dynamics-api/default.nix index bb0c84a77c..6d8a4d9a99 100644 --- a/melodic/rc-dynamics-api/default.nix +++ b/melodic/rc-dynamics-api/default.nix @@ -26,6 +26,6 @@ buildRosPackage { velocity, or acceleration and are published on demand via several data streams. For a complete list and descriptions of these dynamics states and the respective data streams please refer to rc_visard's user manual.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rc-genicam-api/default.nix b/melodic/rc-genicam-api/default.nix index f0b22b43e3..f696ef1acf 100644 --- a/melodic/rc-genicam-api/default.nix +++ b/melodic/rc-genicam-api/default.nix @@ -30,6 +30,6 @@ buildRosPackage { reading and setting parameters, streaming and synchronizing images. See LICENSE.md for licensing terms of the different parts.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rc-hand-eye-calibration-client/default.nix b/melodic/rc-hand-eye-calibration-client/default.nix index f5cbb5c652..8b2f05bd22 100644 --- a/melodic/rc-hand-eye-calibration-client/default.nix +++ b/melodic/rc-hand-eye-calibration-client/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The rc_hand_eye_calibration_client package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rc-visard-description/default.nix b/melodic/rc-visard-description/default.nix index c129e1f4ea..597b3363a2 100644 --- a/melodic/rc-visard-description/default.nix +++ b/melodic/rc-visard-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Visualization package for rc_visard''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rc-visard-driver/default.nix b/melodic/rc-visard-driver/default.nix index c500403eda..9123d45adb 100644 --- a/melodic/rc-visard-driver/default.nix +++ b/melodic/rc-visard-driver/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The rc_visard_driver provides data from a Roboception rc_visard 3D sensor on several ROS topics.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rc-visard/default.nix b/melodic/rc-visard/default.nix index 35402d3483..ed11048363 100644 --- a/melodic/rc-visard/default.nix +++ b/melodic/rc-visard/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Roboception rc_visard support meta package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/realtime-tools/default.nix b/melodic/realtime-tools/default.nix index 59a8c22fa0..d1cb8f3792 100644 --- a/melodic/realtime-tools/default.nix +++ b/melodic/realtime-tools/default.nix @@ -27,6 +27,6 @@ buildRosPackage { created, the realtime publisher will start using it, which will result in major API changes for the realtime publisher (removal of all lock methods).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/resized-image-transport/default.nix b/melodic/resized-image-transport/default.nix index 659534a687..2d0cd28152 100644 --- a/melodic/resized-image-transport/default.nix +++ b/melodic/resized-image-transport/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "6631d7021aa7bf102ca9be8925ec2fdc5dc4fd4ac4effa126ae8df74bb33232c"; }; - buildInputs = [ std-srvs message-generation nodelet image-transport sensor-msgs cv-bridge jsk-topic-tools ]; + buildInputs = [ std-srvs image-transport sensor-msgs cv-bridge jsk-topic-tools message-generation nodelet ]; checkInputs = [ rostest jsk-tools jsk-recognition-utils ]; - propagatedBuildInputs = [ std-srvs cv-bridge message-runtime image-transport sensor-msgs nodelet jsk-topic-tools ]; + propagatedBuildInputs = [ std-srvs image-transport sensor-msgs cv-bridge jsk-topic-tools message-runtime nodelet ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS nodes to publish resized images.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/resource-retriever/default.nix b/melodic/resource-retriever/default.nix index 20c42c36c5..50dd15af32 100644 --- a/melodic/resource-retriever/default.nix +++ b/melodic/resource-retriever/default.nix @@ -13,7 +13,7 @@ buildRosPackage { }; buildInputs = [ curl roslib rosconsole boost ]; - propagatedBuildInputs = [ curl rosconsole boost pythonPackages.rospkg roslib ]; + propagatedBuildInputs = [ rosconsole boost pythonPackages.rospkg curl roslib ]; nativeBuildInputs = [ catkin ]; meta = { @@ -23,6 +23,6 @@ buildRosPackage { file:// url. The resourse retriever was initially designed to load mesh files into memory, but it can be used for any type of data. The resource retriever is based on the the libcurl library.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/respeaker-ros/default.nix b/melodic/respeaker-ros/default.nix index 2209e0f57f..195878bfa3 100644 --- a/melodic/respeaker-ros/default.nix +++ b/melodic/respeaker-ros/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The respeaker_ros package''; - #license = lib.licenses.Apache; + license = with lib.licenses; [ "Apache-1.0" ]; }; } diff --git a/melodic/rexrov2-control/default.nix b/melodic/rexrov2-control/default.nix index 3f91b261f6..a8c5b573ae 100644 --- a/melodic/rexrov2-control/default.nix +++ b/melodic/rexrov2-control/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "9a67201f385a31d026e498160846d97db310a798104f41aa97173e6827211ae6"; }; - propagatedBuildInputs = [ gazebo-ros uuv-control-cascaded-pid gazebo-ros-control uuv-trajectory-control uuv-thruster-manager ]; + propagatedBuildInputs = [ gazebo-ros uuv-trajectory-control uuv-thruster-manager uuv-control-cascaded-pid gazebo-ros-control ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The rexrov2_control package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/rexrov2-description/default.nix b/melodic/rexrov2-description/default.nix index f40593320d..ea37ffe0e0 100644 --- a/melodic/rexrov2-description/default.nix +++ b/melodic/rexrov2-description/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; checkInputs = [ rostest xacro rosunit ]; - propagatedBuildInputs = [ gazebo-ros uuv-assistants uuv-gazebo-ros-plugins uuv-sensor-ros-plugins robot-state-publisher uuv-descriptions xacro gazebo-ros-control ]; + propagatedBuildInputs = [ gazebo-ros uuv-gazebo-ros-plugins uuv-sensor-ros-plugins uuv-assistants uuv-descriptions robot-state-publisher xacro gazebo-ros-control ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The robot description files for the RexROV 2 underwater vehicle''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/rexrov2-gazebo/default.nix b/melodic/rexrov2-gazebo/default.nix index d467675561..2288490576 100644 --- a/melodic/rexrov2-gazebo/default.nix +++ b/melodic/rexrov2-gazebo/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Package with launch files for demonstrations with the RexROV 2 vehicle''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/rgbd-launch/default.nix b/melodic/rgbd-launch/default.nix index 78e702114f..c6cc3c1b52 100644 --- a/melodic/rgbd-launch/default.nix +++ b/melodic/rgbd-launch/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''Launch files to open an RGBD device and load all nodelets to convert raw depth/RGB/IR streams to depth images, disparity images, and (registered) point clouds.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-activity-msgs/default.nix b/melodic/robot-activity-msgs/default.nix index d5c2091b45..7366cbb9ff 100644 --- a/melodic/robot-activity-msgs/default.nix +++ b/melodic/robot-activity-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains messages used by robot_activity, such as node's state and error''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-activity-tutorials/default.nix b/melodic/robot-activity-tutorials/default.nix index a022719f96..559f74181c 100644 --- a/melodic/robot-activity-tutorials/default.nix +++ b/melodic/robot-activity-tutorials/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The robot_activity_tutorials package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-activity/default.nix b/melodic/robot-activity/default.nix index 868c0e7d93..67ca24aac3 100644 --- a/melodic/robot-activity/default.nix +++ b/melodic/robot-activity/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The robot_activity package implements ROS node lifecycle''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-calibration-msgs/default.nix b/melodic/robot-calibration-msgs/default.nix index ad8ac3688d..14c441e7aa 100644 --- a/melodic/robot-calibration-msgs/default.nix +++ b/melodic/robot-calibration-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "ea0ffb952c39266c63a6a96dea7b3763b0c36c4b28363c08d41171ed1a021097"; }; - buildInputs = [ message-generation actionlib-msgs std-msgs sensor-msgs geometry-msgs ]; - propagatedBuildInputs = [ message-runtime actionlib-msgs std-msgs sensor-msgs geometry-msgs ]; + buildInputs = [ actionlib-msgs sensor-msgs message-generation std-msgs geometry-msgs ]; + propagatedBuildInputs = [ actionlib-msgs sensor-msgs message-runtime std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Messages for calibrating a robot''; - #license = lib.licenses.Apache2; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/robot-calibration/default.nix b/melodic/robot-calibration/default.nix index 349efc695d..2d3f620049 100644 --- a/melodic/robot-calibration/default.nix +++ b/melodic/robot-calibration/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "bd39604970ae9dd0a27d006fac49afbf50604f89ff7d7218e4967c91d866b175"; }; - buildInputs = [ ceres-solver orocos-kdl tf2-geometry-msgs control-msgs rosbag cv-bridge tf2-ros nav-msgs actionlib std-msgs moveit-msgs protobuf roscpp tf visualization-msgs robot-calibration-msgs geometry-msgs suitesparse kdl-parser pluginlib gflags camera-calibration-parsers sensor-msgs ]; - propagatedBuildInputs = [ ceres-solver orocos-kdl tf2-geometry-msgs control-msgs rosbag cv-bridge tf2-ros nav-msgs actionlib std-msgs moveit-msgs protobuf roscpp tf visualization-msgs robot-calibration-msgs geometry-msgs suitesparse kdl-parser pluginlib camera-calibration-parsers sensor-msgs ]; + buildInputs = [ cv-bridge actionlib tf robot-calibration-msgs geometry-msgs suitesparse gflags camera-calibration-parsers ceres-solver orocos-kdl tf2-geometry-msgs control-msgs rosbag tf2-ros nav-msgs std-msgs moveit-msgs protobuf roscpp visualization-msgs kdl-parser pluginlib sensor-msgs ]; + propagatedBuildInputs = [ cv-bridge actionlib tf robot-calibration-msgs geometry-msgs suitesparse camera-calibration-parsers ceres-solver orocos-kdl tf2-geometry-msgs control-msgs rosbag tf2-ros nav-msgs std-msgs moveit-msgs protobuf roscpp visualization-msgs kdl-parser pluginlib sensor-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Calibrate a Robot''; - #license = lib.licenses.Apache2; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/robot-controllers-interface/default.nix b/melodic/robot-controllers-interface/default.nix index 80b955a0bd..c1e72a0e9f 100644 --- a/melodic/robot-controllers-interface/default.nix +++ b/melodic/robot-controllers-interface/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Generic framework for robot controls.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-controllers-msgs/default.nix b/melodic/robot-controllers-msgs/default.nix index a8597f4e28..0b39dc3bcd 100644 --- a/melodic/robot-controllers-msgs/default.nix +++ b/melodic/robot-controllers-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages for use with robot_controllers framework.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-controllers/default.nix b/melodic/robot-controllers/default.nix index 4da3df9e01..17b19fedd4 100644 --- a/melodic/robot-controllers/default.nix +++ b/melodic/robot-controllers/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Some basic robot controllers for use with robot_controllers_interface.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-localization/default.nix b/melodic/robot-localization/default.nix index c0194412f5..66a60c7bfa 100644 --- a/melodic/robot-localization/default.nix +++ b/melodic/robot-localization/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "ec11a24842691aeb10996db5752bd1b2af596a93c2598793afc12075009cc22d"; }; - buildInputs = [ std-srvs tf2-geometry-msgs tf2-ros nav-msgs xmlrpcpp std-msgs diagnostic-msgs nodelet roscpp geometry-msgs cmake-modules roslint libyamlcpp sensor-msgs message-filters eigen-conversions geographic-msgs diagnostic-updater tf2 message-generation eigen pythonPackages.catkin-pkg ]; + buildInputs = [ diagnostic-msgs geometry-msgs roslint message-filters message-generation eigen-conversions std-srvs tf2-geometry-msgs tf2-ros nav-msgs xmlrpcpp std-msgs nodelet roscpp cmake-modules libyamlcpp sensor-msgs geographic-msgs diagnostic-updater tf2 eigen pythonPackages.catkin-pkg ]; checkInputs = [ rostest rosbag rosunit ]; - propagatedBuildInputs = [ std-srvs tf2-geometry-msgs tf2-ros nav-msgs xmlrpcpp std-msgs diagnostic-msgs nodelet roscpp geometry-msgs cmake-modules libyamlcpp sensor-msgs message-filters geographic-msgs diagnostic-updater tf2 message-runtime eigen eigen-conversions ]; + propagatedBuildInputs = [ diagnostic-msgs geometry-msgs message-filters message-runtime eigen-conversions std-srvs tf2-geometry-msgs tf2-ros nav-msgs xmlrpcpp std-msgs nodelet roscpp cmake-modules libyamlcpp sensor-msgs geographic-msgs diagnostic-updater tf2 eigen ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Provides nonlinear state estimation through sensor fusion of an abritrary number of sensors.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-mechanism-controllers/default.nix b/melodic/robot-mechanism-controllers/default.nix index 51ad5a5f63..2c71e06b6b 100644 --- a/melodic/robot-mechanism-controllers/default.nix +++ b/melodic/robot-mechanism-controllers/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "3edf4bf3c0aec34188fe768259562f3af1e4795c971f6ce581febdd56a186dfd"; }; - buildInputs = [ pr2-controllers-msgs filters control-msgs trajectory-msgs libtool actionlib tf-conversions std-msgs diagnostic-msgs roscpp tf pr2-mechanism-model geometry-msgs kdl-parser pr2-controller-interface pluginlib control-toolbox realtime-tools message-filters pr2-controller-manager message-generation angles eigen-conversions ]; - propagatedBuildInputs = [ pr2-controllers-msgs filters control-msgs trajectory-msgs libtool actionlib std-msgs tf-conversions rospy tf roscpp pr2-mechanism-model diagnostic-msgs geometry-msgs kdl-parser pr2-controller-interface pluginlib control-toolbox realtime-tools message-filters pr2-controller-manager message-runtime angles eigen-conversions ]; + buildInputs = [ filters actionlib tf-conversions diagnostic-msgs tf geometry-msgs realtime-tools message-filters pr2-controller-manager message-generation angles eigen-conversions pr2-controllers-msgs control-msgs trajectory-msgs libtool std-msgs roscpp pr2-mechanism-model kdl-parser pr2-controller-interface pluginlib control-toolbox ]; + propagatedBuildInputs = [ filters actionlib tf-conversions rospy diagnostic-msgs tf geometry-msgs realtime-tools message-filters pr2-controller-manager message-runtime angles eigen-conversions pr2-controllers-msgs control-msgs trajectory-msgs libtool std-msgs roscpp pr2-mechanism-model kdl-parser pr2-controller-interface pluginlib control-toolbox ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Generic Mechanism Controller Library''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-navigation/default.nix b/melodic/robot-navigation/default.nix index acb9c0df49..50dd3fe739 100644 --- a/melodic/robot-navigation/default.nix +++ b/melodic/robot-navigation/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "c7d0ad170d41279ececdacd19f49e8e5116edf8b45a0be3f66a0fe5a707b9c08"; }; - propagatedBuildInputs = [ dwb-local-planner nav-core-adapter nav-grid-pub-sub dlux-plugins nav-grid nav-grid-iterators dlux-global-planner nav-core2 costmap-queue dwb-critics dwb-plugins nav-2d-utils locomove-base dwb-msgs locomotor locomotor-msgs global-planner-tests nav-2d-msgs ]; + propagatedBuildInputs = [ dwb-local-planner nav-core-adapter nav-grid-pub-sub dlux-plugins nav-grid dlux-global-planner nav-core2 costmap-queue dwb-critics nav-2d-msgs dwb-plugins nav-2d-utils locomove-base dwb-msgs locomotor locomotor-msgs global-planner-tests nav-grid-iterators ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The robot_navigation package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-pose-ekf/default.nix b/melodic/robot-pose-ekf/default.nix index 3ff6edf969..25d5379743 100644 --- a/melodic/robot-pose-ekf/default.nix +++ b/melodic/robot-pose-ekf/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "5c00ee700ca2a69ca46e5162fa0bf0570a730ff566808059d7c6358fe350844a"; }; - buildInputs = [ nav-msgs message-generation bfl std-msgs sensor-msgs tf geometry-msgs roscpp ]; + buildInputs = [ sensor-msgs roscpp nav-msgs message-generation bfl std-msgs tf geometry-msgs ]; checkInputs = [ rostest rosbag ]; - propagatedBuildInputs = [ nav-msgs message-runtime bfl std-msgs sensor-msgs tf geometry-msgs roscpp ]; + propagatedBuildInputs = [ sensor-msgs roscpp nav-msgs message-runtime bfl std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The Robot Pose EKF package is used to estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources. It uses an extended Kalman filter with a 6D model (3D position and 3D orientation) to combine measurements from wheel odometry, IMU sensor and visual odometry. The basic idea is to offer loosely coupled integration with different sensors, where sensor signals are received as ROS messages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-self-filter/default.nix b/melodic/robot-self-filter/default.nix index 997ef515bc..faa32df2c2 100644 --- a/melodic/robot-self-filter/default.nix +++ b/melodic/robot-self-filter/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Filters the robot's body out of point clouds.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-state-publisher/default.nix b/melodic/robot-state-publisher/default.nix index 1ad282af5d..bccdea4054 100644 --- a/melodic/robot-state-publisher/default.nix +++ b/melodic/robot-state-publisher/default.nix @@ -26,6 +26,6 @@ buildRosPackage { tree model of the robot. The package can both be used as a library and as a ROS node. This package has been well tested and the code is stable. No major changes are planned in the near future.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot-upstart/default.nix b/melodic/robot-upstart/default.nix index 01d56f34cb..cbfbc5e698 100644 --- a/melodic/robot-upstart/default.nix +++ b/melodic/robot-upstart/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The robot_upstart package provides scripts which may be used to install and uninstall Ubuntu Linux upstart jobs which launch groups of roslaunch files.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robot/default.nix b/melodic/robot/default.nix index cbd22c0da9..c2cc9cbe21 100644 --- a/melodic/robot/default.nix +++ b/melodic/robot/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, filters, kdl-parser, ros-base, control-msgs, executive-smach, catkin, diagnostics, urdf-parser-plugin, geometry, urdf, robot-state-publisher, kdl-parser-py, joint-state-publisher, xacro }: +{ lib, buildRosPackage, fetchurl, filters, kdl-parser, ros-base, control-msgs, executive-smach, catkin, urdf-parser-plugin, diagnostics, geometry, urdf, robot-state-publisher, kdl-parser-py, joint-state-publisher, xacro }: buildRosPackage { pname = "ros-melodic-robot"; version = "1.4.1"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "4f0efd47cf90e8a1f56602612d73ba032fbb231dec3091f53b795a7d67cbe02b"; }; - propagatedBuildInputs = [ filters ros-base kdl-parser control-msgs executive-smach diagnostics urdf-parser-plugin geometry urdf robot-state-publisher kdl-parser-py joint-state-publisher xacro ]; + propagatedBuildInputs = [ filters ros-base kdl-parser control-msgs executive-smach urdf-parser-plugin diagnostics geometry urdf robot-state-publisher kdl-parser-py joint-state-publisher xacro ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A metapackage which extends ros_base and includes ROS libaries for any robot hardware. It may not contain any GUI dependencies.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/robotis-manipulator/default.nix b/melodic/robotis-manipulator/default.nix index dbdfb46014..36e6927202 100644 --- a/melodic/robotis-manipulator/default.nix +++ b/melodic/robotis-manipulator/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the manipulation API and functions for controlling the manipulator.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/rocon-app-manager-msgs/default.nix b/melodic/rocon-app-manager-msgs/default.nix index e13fa2c711..932a9ea522 100644 --- a/melodic/rocon-app-manager-msgs/default.nix +++ b/melodic/rocon-app-manager-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages used by the platform app manager.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-bubble-icons/default.nix b/melodic/rocon-bubble-icons/default.nix index 66026381c5..8f04819be8 100644 --- a/melodic/rocon-bubble-icons/default.nix +++ b/melodic/rocon-bubble-icons/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Bubble icon library for rocon.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-console/default.nix b/melodic/rocon-console/default.nix index 390ffe0d21..6e07755098 100644 --- a/melodic/rocon-console/default.nix +++ b/melodic/rocon-console/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Command line python console utilities (mostly for colourisation).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-device-msgs/default.nix b/melodic/rocon-device-msgs/default.nix index eeda7ffdff..c2b0b5cc51 100644 --- a/melodic/rocon-device-msgs/default.nix +++ b/melodic/rocon-device-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages used by rocon devices''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-ebnf/default.nix b/melodic/rocon-ebnf/default.nix index 51cfd04e00..306bbd5c2e 100644 --- a/melodic/rocon-ebnf/default.nix +++ b/melodic/rocon-ebnf/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Internal packaging of the 0.91 version of the simple python EBNF parser written by LParis.''; - #license = lib.licenses.GPL; + license = with lib.licenses; [ gpl1 ]; }; } diff --git a/melodic/rocon-icons/default.nix b/melodic/rocon-icons/default.nix index ae65f79615..769ca73b45 100644 --- a/melodic/rocon-icons/default.nix +++ b/melodic/rocon-icons/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Icons for rocon.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-interaction-msgs/default.nix b/melodic/rocon-interaction-msgs/default.nix index e6d0811824..8b78f2134d 100644 --- a/melodic/rocon-interaction-msgs/default.nix +++ b/melodic/rocon-interaction-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages used by rocon interactions.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-interactions/default.nix b/melodic/rocon-interactions/default.nix index 5980bdf399..8e2ebce32f 100644 --- a/melodic/rocon-interactions/default.nix +++ b/melodic/rocon-interactions/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Interaction management for human interactive agents in the concert.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-launch/default.nix b/melodic/rocon-launch/default.nix index efa5f9ea6a..922fc2d3ff 100644 --- a/melodic/rocon-launch/default.nix +++ b/melodic/rocon-launch/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ pythonPackages.catkin-pkg ]; - propagatedBuildInputs = [ rocon-console rosbash rospy roslaunch rocon-python-utils ]; + propagatedBuildInputs = [ rosbash rocon-console rospy roslaunch rocon-python-utils ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A multi-roslaunch (for single and multi-master systems).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-master-info/default.nix b/melodic/rocon-master-info/default.nix index 052119a90b..aa7f31c092 100644 --- a/melodic/rocon-master-info/default.nix +++ b/melodic/rocon-master-info/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Publish master information - name, description, icon.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-msgs/default.nix b/melodic/rocon-msgs/default.nix index 0c5f0733e3..f8bffcac33 100644 --- a/melodic/rocon-msgs/default.nix +++ b/melodic/rocon-msgs/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, concert-msgs, catkin, gateway-msgs, rocon-app-manager-msgs, rocon-interaction-msgs, rocon-service-pair-msgs, rocon-tutorial-msgs, scheduler-msgs, rocon-device-msgs, concert-service-msgs, rocon-std-msgs }: +{ lib, buildRosPackage, fetchurl, concert-msgs, rocon-std-msgs, catkin, gateway-msgs, rocon-app-manager-msgs, rocon-interaction-msgs, rocon-service-pair-msgs, rocon-tutorial-msgs, scheduler-msgs, rocon-device-msgs, concert-service-msgs }: buildRosPackage { pname = "ros-melodic-rocon-msgs"; version = "0.9.0"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "5eca94dc0ac40d38a417f7e804e77d25f3abb25ceda463b681ad24186a0444c2"; }; - propagatedBuildInputs = [ concert-msgs rocon-std-msgs gateway-msgs rocon-app-manager-msgs rocon-interaction-msgs rocon-service-pair-msgs rocon-tutorial-msgs scheduler-msgs rocon-device-msgs concert-service-msgs ]; + propagatedBuildInputs = [ concert-msgs gateway-msgs rocon-app-manager-msgs rocon-interaction-msgs rocon-service-pair-msgs rocon-tutorial-msgs scheduler-msgs rocon-device-msgs concert-service-msgs rocon-std-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Communication types (msgs/srvs/actions) for robotics in concert (aka multimaster).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-python-comms/default.nix b/melodic/rocon-python-comms/default.nix index 302661221b..c6d821efce 100644 --- a/melodic/rocon-python-comms/default.nix +++ b/melodic/rocon-python-comms/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Service pair libraries for pub/sub non-blocking services.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-python-redis/default.nix b/melodic/rocon-python-redis/default.nix index 83062ed151..47607e5c3c 100644 --- a/melodic/rocon-python-redis/default.nix +++ b/melodic/rocon-python-redis/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Locally patched version of the python redis client (https://github.com/andymccurdy/redis-py).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-python-utils/default.nix b/melodic/rocon-python-utils/default.nix index 636eebf9c8..a12f8becb6 100644 --- a/melodic/rocon-python-utils/default.nix +++ b/melodic/rocon-python-utils/default.nix @@ -14,11 +14,11 @@ buildRosPackage { buildInputs = [ rostest pythonPackages.catkin-pkg ]; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ rospy pythonPackages.rospkg pythonPackages.catkin-pkg roslib rocon-std-msgs ]; + propagatedBuildInputs = [ pythonPackages.rospkg rospy pythonPackages.catkin-pkg roslib rocon-std-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Python system and ros utilities.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-python-wifi/default.nix b/melodic/rocon-python-wifi/default.nix index ceeffa45ee..14c982cd33 100644 --- a/melodic/rocon-python-wifi/default.nix +++ b/melodic/rocon-python-wifi/default.nix @@ -19,6 +19,6 @@ buildRosPackage { description = ''The pythonwifi package is available through pypi, but not through a deb package. This is copy of the package suitable for use through the ROS ecosystem.''; - #license = lib.licenses.GPLv2; + license = with lib.licenses; [ gpl2 ]; }; } diff --git a/melodic/rocon-semantic-version/default.nix b/melodic/rocon-semantic-version/default.nix index ce061ff78b..a696781190 100644 --- a/melodic/rocon-semantic-version/default.nix +++ b/melodic/rocon-semantic-version/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''Internal packaging of the 2.2.2 version of the python semantic version module.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-service-pair-msgs/default.nix b/melodic/rocon-service-pair-msgs/default.nix index e06d66fb9e..74f7f7cfd3 100644 --- a/melodic/rocon-service-pair-msgs/default.nix +++ b/melodic/rocon-service-pair-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Paired pubsubs generators for non-blocking services.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-std-msgs/default.nix b/melodic/rocon-std-msgs/default.nix index f061ea4f9b..af1c2c3283 100644 --- a/melodic/rocon-std-msgs/default.nix +++ b/melodic/rocon-std-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Standard messages used by other rocon specific package types.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-tools/default.nix b/melodic/rocon-tools/default.nix index 5f2af88a02..ed86690e49 100644 --- a/melodic/rocon-tools/default.nix +++ b/melodic/rocon-tools/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Utilities and tools developed for rocon, but usable beyond the boundaries of rocon.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-tutorial-msgs/default.nix b/melodic/rocon-tutorial-msgs/default.nix index 0b0fc9d3ed..bac16b953b 100644 --- a/melodic/rocon-tutorial-msgs/default.nix +++ b/melodic/rocon-tutorial-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages used by rocon tutorials.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rocon-uri/default.nix b/melodic/rocon-uri/default.nix index fba31a4589..8afdfeb769 100644 --- a/melodic/rocon-uri/default.nix +++ b/melodic/rocon-uri/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ rocon-console rospy pythonPackages.rospkg rocon-ebnf rocon-python-utils ]; + propagatedBuildInputs = [ pythonPackages.rospkg rocon-ebnf rocon-console rospy rocon-python-utils ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Module for working with rocon uri strings.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ros-base/default.nix b/melodic/ros-base/default.nix index 64afd774f5..8f4237b1c3 100644 --- a/melodic/ros-base/default.nix +++ b/melodic/ros-base/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "0b0cab7cb298a642bd33a0c4d7e17f10ac6533a1a59745a11e96c58d238f47eb"; }; - propagatedBuildInputs = [ bond-core actionlib ros-core dynamic-reconfigure nodelet-core ]; + propagatedBuildInputs = [ ros-core bond-core actionlib nodelet-core dynamic-reconfigure ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A metapackage which extends ros_core and includes other basic non-robot tools like actionlib, dynamic reconfigure, nodelets, and pluginlib.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ros-canopen/default.nix b/melodic/ros-canopen/default.nix index 1a87d0e4d4..a8ecbda88d 100644 --- a/melodic/ros-canopen/default.nix +++ b/melodic/ros-canopen/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "8a5c65352a4fdb30215c811264abe1e29d326afebac95bb06f50124bb78ca5f1"; }; - propagatedBuildInputs = [ canopen-motor-node socketcan-interface socketcan-bridge canopen-chain-node can-msgs canopen-master canopen-402 ]; + propagatedBuildInputs = [ socketcan-bridge can-msgs canopen-402 canopen-motor-node socketcan-interface canopen-chain-node canopen-master ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A generic canopen implementation for ROS''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/ros-comm/default.nix b/melodic/ros-comm/default.nix index d70030d820..fa3b728a8b 100644 --- a/melodic/ros-comm/default.nix +++ b/melodic/ros-comm/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "e50bee6dd4635917c0599d4e97199ac10dbb1e1a8efbb541889076bf10473198"; }; - propagatedBuildInputs = [ std-srvs rosmaster rosconsole roswtf rosbag ros rosout rosservice rosmsg rosgraph-msgs rosgraph xmlrpcpp rospy roscpp rosnode rosparam message-filters roslisp rostest rostopic topic-tools roslaunch ]; + propagatedBuildInputs = [ rosconsole ros rosout rosservice rosgraph-msgs rosgraph rospy message-filters roslaunch std-srvs rosmaster roswtf rosbag rosmsg xmlrpcpp roscpp rosnode rosparam roslisp rostest rostopic topic-tools ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS communications-related packages, including core client libraries (roscpp, rospy) and graph introspection tools (rostopic, rosnode, rosservice, rosparam).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ros-control-boilerplate/default.nix b/melodic/ros-control-boilerplate/default.nix index ecdc7fbda3..43cce9d008 100644 --- a/melodic/ros-control-boilerplate/default.nix +++ b/melodic/ros-control-boilerplate/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "b597b2799ddfb59bdc4e395c3392f794594606bf24e929ebcf03e4cb253dc576"; }; - buildInputs = [ controller-manager hardware-interface cmake-modules gflags control-msgs control-toolbox trajectory-msgs joint-limits-interface sensor-msgs urdf actionlib std-msgs rosparam-shortcuts roscpp transmission-interface ]; - propagatedBuildInputs = [ controller-manager hardware-interface control-msgs control-toolbox trajectory-msgs joint-limits-interface sensor-msgs urdf actionlib std-msgs rosparam-shortcuts roscpp transmission-interface ]; + buildInputs = [ controller-manager hardware-interface cmake-modules gflags control-msgs trajectory-msgs control-toolbox joint-limits-interface sensor-msgs urdf actionlib std-msgs rosparam-shortcuts roscpp transmission-interface ]; + propagatedBuildInputs = [ controller-manager hardware-interface control-msgs trajectory-msgs control-toolbox joint-limits-interface sensor-msgs urdf actionlib std-msgs rosparam-shortcuts roscpp transmission-interface ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Simple simulation interface and template for setting up a hardware interface for ros_control''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ros-control/default.nix b/melodic/ros-control/default.nix index ce2b4234ce..5303865063 100644 --- a/melodic/ros-control/default.nix +++ b/melodic/ros-control/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A set of packages that include controller interfaces, controller managers, transmissions and hardware_interfaces.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ros-controllers/default.nix b/melodic/ros-controllers/default.nix index e8761e207d..434298c691 100644 --- a/melodic/ros-controllers/default.nix +++ b/melodic/ros-controllers/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Library of ros controllers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ros-core/default.nix b/melodic/ros-core/default.nix index 009b9e5ca1..e77a3cc524 100644 --- a/melodic/ros-core/default.nix +++ b/melodic/ros-core/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "390d24da9397fce3a11f1dc7a0a23fb0886b81a4cfd2473906508358a670782d"; }; - propagatedBuildInputs = [ ros-comm rospack std-srvs rosconsole gencpp genlisp class-loader ros catkin rosconsole-bridge rosgraph-msgs roscpp-core std-msgs common-msgs cmake-modules pluginlib gennodejs roslisp message-generation rosbag-migration-rule message-runtime geneus genmsg genpy ]; + propagatedBuildInputs = [ rosconsole gencpp genlisp class-loader ros rosconsole-bridge rosgraph-msgs roscpp-core gennodejs message-generation rosbag-migration-rule message-runtime genmsg ros-comm rospack std-srvs catkin std-msgs common-msgs cmake-modules pluginlib roslisp geneus genpy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A metapackage to aggregate the packages required to use publish / subscribe, services, launch files, and other core ROS concepts.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ros-emacs-utils/default.nix b/melodic/ros-emacs-utils/default.nix index 3fb450275e..7dd0105232 100644 --- a/melodic/ros-emacs-utils/default.nix +++ b/melodic/ros-emacs-utils/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''A metapackage of Emacs utils for ROS. Only there for simplifying the release process.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ros-environment/default.nix b/melodic/ros-environment/default.nix index d032bd113c..e03f9b9f16 100644 --- a/melodic/ros-environment/default.nix +++ b/melodic/ros-environment/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''The package provides the environment variables `ROS_VERSION`, `ROS_DISTRO`, `ROS_PACKAGE_PATH`, and `ROS_ETC_DIR`.''; - #license = lib.licenses.Apache License 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/ros-introspection/default.nix b/melodic/ros-introspection/default.nix index 1b0f7d3ea9..a035052e7f 100644 --- a/melodic/ros-introspection/default.nix +++ b/melodic/ros-introspection/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The ros_introspection package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ros-monitoring-msgs/default.nix b/melodic/ros-monitoring-msgs/default.nix index 5c85662392..8b29ee3d5e 100644 --- a/melodic/ros-monitoring-msgs/default.nix +++ b/melodic/ros-monitoring-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages for publishing monitoring data about ROS systems''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/ros-pytest/default.nix b/melodic/ros-pytest/default.nix index e5ac3bdc75..77a0cb7708 100644 --- a/melodic/ros-pytest/default.nix +++ b/melodic/ros-pytest/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The ros_pytest package''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/ros-realtime/default.nix b/melodic/ros-realtime/default.nix index 5343ab869c..6acc66b7e3 100644 --- a/melodic/ros-realtime/default.nix +++ b/melodic/ros-realtime/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The ros_realtime package''; - #license = lib.licenses.TODO; + license = with lib.licenses; [ "TODO" ]; }; } diff --git a/melodic/ros-reflexxes/default.nix b/melodic/ros-reflexxes/default.nix index fdc1125ffe..c8068e2229 100644 --- a/melodic/ros-reflexxes/default.nix +++ b/melodic/ros-reflexxes/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The ros_reflexxes package''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/ros-tutorials/default.nix b/melodic/ros-tutorials/default.nix index 5d43bf722f..0a6eaaf559 100644 --- a/melodic/ros-tutorials/default.nix +++ b/melodic/ros-tutorials/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ros_tutorials contains packages that demonstrate various features of ROS, as well as support packages which help demonstrate those features.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ros-type-introspection/default.nix b/melodic/ros-type-introspection/default.nix index d12e0b7f47..2884636e0f 100644 --- a/melodic/ros-type-introspection/default.nix +++ b/melodic/ros-type-introspection/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The ros_type_introspection package allows the user to parse and deserialize ROS messages which type is unknown at compilation time.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ros/default.nix b/melodic/ros/default.nix index 7607600185..0bf4c68aa2 100644 --- a/melodic/ros/default.nix +++ b/melodic/ros/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''ROS packaging system''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosapi/default.nix b/melodic/rosapi/default.nix index 02feda3c8d..3282d7eb23 100644 --- a/melodic/rosapi/default.nix +++ b/melodic/rosapi/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Provides service calls for getting ros meta-information, like list of topics, services, params, etc.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosatomic/default.nix b/melodic/rosatomic/default.nix index b6d49d489b..e99174dd01 100644 --- a/melodic/rosatomic/default.nix +++ b/melodic/rosatomic/default.nix @@ -18,6 +18,6 @@ buildRosPackage { description = ''rosatomic provides the C++11-style atomic operations by pulling symbols from the proposed Boost.Atomic package into the ros namespace. Once C++11-style atomics (std::atomic) are available from compilers, rosatomic will conditionally use those instead.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal boost ]; }; } diff --git a/melodic/rosauth/default.nix b/melodic/rosauth/default.nix index 0173cbf44e..0894a1f604 100644 --- a/melodic/rosauth/default.nix +++ b/melodic/rosauth/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Server Side tools for Authorization and Authentication of ROS Clients''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosbag-migration-rule/default.nix b/melodic/rosbag-migration-rule/default.nix index 8743c110bd..7324e2c7b3 100644 --- a/melodic/rosbag-migration-rule/default.nix +++ b/melodic/rosbag-migration-rule/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''This empty package allows to export rosbag migration rule files without depending on rosbag.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosbag-pandas/default.nix b/melodic/rosbag-pandas/default.nix index 0aeca1ffc8..50a108184e 100644 --- a/melodic/rosbag-pandas/default.nix +++ b/melodic/rosbag-pandas/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "a1e49a019fe7770b6a4de2ba9c8551c78e6288b2a32f7da4227f97d48e929a9f"; }; - propagatedBuildInputs = [ rospy-message-converter pythonPackages.numpy pythonPackages.pandas rosbag roslib pythonPackages.matplotlib ]; + propagatedBuildInputs = [ pythonPackages.numpy rosbag rospy-message-converter pythonPackages.pandas roslib pythonPackages.matplotlib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Create a Pandas data frame from a ros bag file.''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/rosbag-storage/default.nix b/melodic/rosbag-storage/default.nix index 491e8a0322..33eae7f117 100644 --- a/melodic/rosbag-storage/default.nix +++ b/melodic/rosbag-storage/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This is a set of tools for recording from and playing back ROS message without relying on the ROS client library.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosbag/default.nix b/melodic/rosbag/default.nix index 5eaea2143f..41dbb3ed28 100644 --- a/melodic/rosbag/default.nix +++ b/melodic/rosbag/default.nix @@ -13,13 +13,13 @@ buildRosPackage { }; buildInputs = [ rosbag-storage std-srvs rosconsole cpp-common boost xmlrpcpp roscpp-serialization topic-tools pythonPackages.pillow roscpp ]; - propagatedBuildInputs = [ rosbag-storage std-srvs rosconsole boost pythonPackages.rospkg genpy roscpp pythonPackages.pycrypto pythonPackages.python-gnupg xmlrpcpp rospy topic-tools genmsg roslib ]; + propagatedBuildInputs = [ rosbag-storage std-srvs rosconsole boost pythonPackages.rospkg genpy pythonPackages.pycrypto roslib pythonPackages.python-gnupg xmlrpcpp rospy topic-tools genmsg roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This is a set of tools for recording from and playing back to ROS topics. It is intended to be high performance and avoids deserialization and reserialization of the messages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosbaglive/default.nix b/melodic/rosbaglive/default.nix index 7befa9bd61..2ca1f3cbb3 100644 --- a/melodic/rosbaglive/default.nix +++ b/melodic/rosbaglive/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Plays rosbags as though they were happening NOW.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosbash-params/default.nix b/melodic/rosbash-params/default.nix index 24e63b4ce4..0356b83ac4 100644 --- a/melodic/rosbash-params/default.nix +++ b/melodic/rosbash-params/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Tools for writing ros-node-like bash scripts''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosbash/default.nix b/melodic/rosbash/default.nix index c2312713e2..b309bc4ef9 100644 --- a/melodic/rosbash/default.nix +++ b/melodic/rosbash/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Assorted shell commands for using ros with bash.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosboost-cfg/default.nix b/melodic/rosboost-cfg/default.nix index b16bee8780..a89f225e80 100644 --- a/melodic/rosboost-cfg/default.nix +++ b/melodic/rosboost-cfg/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''Contains scripts used by the rosboost-cfg tool for determining cflags/lflags/etc. of boost on your system''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosbridge-msgs/default.nix b/melodic/rosbridge-msgs/default.nix index ee6a036113..e776ae0088 100644 --- a/melodic/rosbridge-msgs/default.nix +++ b/melodic/rosbridge-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Package containing message files''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosbridge-server/default.nix b/melodic/rosbridge-server/default.nix index 94536455dc..83fbb3dd65 100644 --- a/melodic/rosbridge-server/default.nix +++ b/melodic/rosbridge-server/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "49f8201f557a79486c03ea3d4f7b10a57d55b50b43248459f7dd55fd859f9c97"; }; - propagatedBuildInputs = [ pythonPackages.backports_ssl_match_hostname rosbridge-library pythonPackages.twisted rosauth rospy rosapi rosbridge-msgs pythonPackages.tornado ]; + propagatedBuildInputs = [ rosapi pythonPackages.backports_ssl_match_hostname rosbridge-library pythonPackages.twisted rosauth rospy rosbridge-msgs pythonPackages.tornado ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A WebSocket interface to rosbridge.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosbridge-suite/default.nix b/melodic/rosbridge-suite/default.nix index 6d2c97fbbb..27fac407fd 100644 --- a/melodic/rosbridge-suite/default.nix +++ b/melodic/rosbridge-suite/default.nix @@ -22,6 +22,6 @@ buildRosPackage { Rosbridge_suite is a meta-package containing rosbridge, various front end packages for rosbridge like a WebSocket package, and helper packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosbuild/default.nix b/melodic/rosbuild/default.nix index 9ff577d1f6..3c909c286a 100644 --- a/melodic/rosbuild/default.nix +++ b/melodic/rosbuild/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''rosbuild contains scripts for managing the CMake-based build system for ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosclean/default.nix b/melodic/rosclean/default.nix index 4d154b7647..ed9380c7d0 100644 --- a/melodic/rosclean/default.nix +++ b/melodic/rosclean/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''rosclean: cleanup filesystem resources (e.g. log files).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roscompile/default.nix b/melodic/roscompile/default.nix index eb40ec56e3..1548243263 100644 --- a/melodic/roscompile/default.nix +++ b/melodic/roscompile/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The roscompile package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosconsole-bridge/default.nix b/melodic/rosconsole-bridge/default.nix index ba838fb801..12e6c4e67e 100644 --- a/melodic/rosconsole-bridge/default.nix +++ b/melodic/rosconsole-bridge/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''rosconsole_bridge is a package used in conjunction with console_bridge and rosconsole for connecting console_bridge-based logging to rosconsole-based logging.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosconsole/default.nix b/melodic/rosconsole/default.nix index 4eccb79f3d..44cdbc75b1 100644 --- a/melodic/rosconsole/default.nix +++ b/melodic/rosconsole/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS console output library.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roscpp-core/default.nix b/melodic/roscpp-core/default.nix index ee92219ef3..db5209aaaf 100644 --- a/melodic/roscpp-core/default.nix +++ b/melodic/roscpp-core/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Underlying data libraries for roscpp messages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roscpp-serialization/default.nix b/melodic/roscpp-serialization/default.nix index 06e08cd719..df562ed623 100644 --- a/melodic/roscpp-serialization/default.nix +++ b/melodic/roscpp-serialization/default.nix @@ -21,6 +21,6 @@ buildRosPackage { MessagesSerializationAndAdaptingTypes. This package is a component of roscpp.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roscpp-traits/default.nix b/melodic/roscpp-traits/default.nix index 75c4dea429..80c0dc9b27 100644 --- a/melodic/roscpp-traits/default.nix +++ b/melodic/roscpp-traits/default.nix @@ -20,6 +20,6 @@ buildRosPackage { MessagesTraits. This package is a component of roscpp.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roscpp-tutorials/default.nix b/melodic/roscpp-tutorials/default.nix index afd7194429..d64365799f 100644 --- a/melodic/roscpp-tutorials/default.nix +++ b/melodic/roscpp-tutorials/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rosconsole, catkin, roscpp, message-generation, message-runtime, roscpp-serialization, std-msgs, rostime }: +{ lib, buildRosPackage, fetchurl, rosconsole, catkin, rostime, message-generation, message-runtime, roscpp-serialization, std-msgs, roscpp }: buildRosPackage { pname = "ros-melodic-roscpp-tutorials"; version = "0.9.1"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "ea926bbb8d417ecfd5116647ffc45ede193fd3d6ad838c89b026560ce56e7987"; }; - buildInputs = [ message-generation rosconsole roscpp-serialization std-msgs rostime roscpp ]; - propagatedBuildInputs = [ rosconsole message-runtime roscpp-serialization std-msgs rostime roscpp ]; + buildInputs = [ rosconsole roscpp message-generation roscpp-serialization std-msgs rostime ]; + propagatedBuildInputs = [ rosconsole roscpp message-runtime roscpp-serialization std-msgs rostime ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package attempts to show the features of ROS step-by-step, including using messages, servers, parameters, etc.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roscpp/default.nix b/melodic/roscpp/default.nix index 3e2fdbf30f..a92b853d62 100644 --- a/melodic/roscpp/default.nix +++ b/melodic/roscpp/default.nix @@ -26,6 +26,6 @@ buildRosPackage { roscpp is the most widely used ROS client library and is designed to be the high-performance library for ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roscreate/default.nix b/melodic/roscreate/default.nix index f841000574..50539727d4 100644 --- a/melodic/roscreate/default.nix +++ b/melodic/roscreate/default.nix @@ -19,6 +19,6 @@ buildRosPackage { description = ''roscreate contains a tool that assists in the creation of ROS filesystem resources. It provides: roscreate-pkg, which creates a new package directory, including the appropriate build and manifest files.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosdiagnostic/default.nix b/melodic/rosdiagnostic/default.nix index 2f27872ee4..87e711a277 100644 --- a/melodic/rosdiagnostic/default.nix +++ b/melodic/rosdiagnostic/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Command to print aggregated diagnostic contents to the command line''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosemacs/default.nix b/melodic/rosemacs/default.nix index 062c224245..b672550b04 100644 --- a/melodic/rosemacs/default.nix +++ b/melodic/rosemacs/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''ROS tools for those who live in Emacs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roseus/default.nix b/melodic/roseus/default.nix index d34bf78170..800b6885e1 100644 --- a/melodic/roseus/default.nix +++ b/melodic/roseus/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "e68ad89c7896f6b30f8a8dea7b8a0216dc5bfad5988cf8f287dd148069f5ccd1"; }; - buildInputs = [ jskeus std-srvs rospack actionlib-msgs mk rosmsg rosbuild tf2-ros actionlib std-msgs dynamic-reconfigure roscpp tf actionlib-tutorials euslisp rosnode geneus visualization-msgs geometry-msgs rosbash sensor-msgs rostest message-generation roslang rostopic angles coreutils ]; + buildInputs = [ jskeus actionlib-msgs actionlib tf actionlib-tutorials geometry-msgs rosbash message-generation roslang angles coreutils std-srvs rospack mk rosmsg rosbuild tf2-ros std-msgs roscpp visualization-msgs euslisp rosnode geneus sensor-msgs rostest rostopic dynamic-reconfigure ]; checkInputs = [ xorg.xorgserver ]; - propagatedBuildInputs = [ jskeus std-srvs rospack actionlib-msgs rosmsg tf2-ros actionlib std-msgs roscpp tf actionlib-tutorials euslisp rosnode geneus visualization-msgs geometry-msgs rosbash sensor-msgs rostest message-runtime roslang dynamic-reconfigure ]; + propagatedBuildInputs = [ jskeus actionlib-msgs actionlib dynamic-reconfigure tf actionlib-tutorials geometry-msgs rosbash message-runtime roslang std-srvs rospack rosmsg tf2-ros std-msgs roscpp visualization-msgs euslisp rosnode sensor-msgs rostest geneus ]; nativeBuildInputs = [ catkin ]; meta = { description = ''EusLisp client for ROS Robot Operating System.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosfmt/default.nix b/melodic/rosfmt/default.nix index dcf317d7ba..aa1a709f09 100644 --- a/melodic/rosfmt/default.nix +++ b/melodic/rosfmt/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''fmt is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and IOStreams.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosgraph-msgs/default.nix b/melodic/rosgraph-msgs/default.nix index 00eb667fe8..067b97856a 100644 --- a/melodic/rosgraph-msgs/default.nix +++ b/melodic/rosgraph-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages relating to the ROS Computation Graph. These are generally considered to be low-level messages that end users do not interact with.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosgraph/default.nix b/melodic/rosgraph/default.nix index ef22ff8a47..49cedc17b7 100644 --- a/melodic/rosgraph/default.nix +++ b/melodic/rosgraph/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''rosgraph contains the rosgraph command-line tool, which prints information about the ROS Computation Graph. It also provides an internal library that can be used by graphical tools.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roslang/default.nix b/melodic/roslang/default.nix index 52bbebd159..9c7ba1ed9b 100644 --- a/melodic/roslang/default.nix +++ b/melodic/roslang/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''roslang is a common package that all ROS client libraries depend on. This is mainly used to find client libraries (via 'rospack depends-on1 roslang').''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roslaunch/default.nix b/melodic/roslaunch/default.nix index ff16aef6da..f2afc8f86b 100644 --- a/melodic/roslaunch/default.nix +++ b/melodic/roslaunch/default.nix @@ -13,7 +13,7 @@ buildRosPackage { }; checkInputs = [ rosbuild ]; - propagatedBuildInputs = [ pythonPackages.paramiko rosmaster pythonPackages.rospkg rosparam rosout pythonPackages.pyyaml rosgraph-msgs rosclean roslib rosunit ]; + propagatedBuildInputs = [ rosmaster pythonPackages.rospkg rosparam rosout pythonPackages.pyyaml rosgraph-msgs rosclean pythonPackages.paramiko roslib rosunit ]; nativeBuildInputs = [ catkin ]; meta = { @@ -24,6 +24,6 @@ buildRosPackage { configuration files (with the .launch extension) that specify the parameters to set and nodes to launch, as well as the machines that they should be run on.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roslib/default.nix b/melodic/roslib/default.nix index 9b26a756d6..2f2f0bc9bc 100644 --- a/melodic/roslib/default.nix +++ b/melodic/roslib/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Base dependencies and support libraries for ROS. roslib contains many of the common data structures and tools that are shared across ROS client library implementations.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roslint/default.nix b/melodic/roslint/default.nix index e6ce4c1bf6..1743a3f62d 100644 --- a/melodic/roslint/default.nix +++ b/melodic/roslint/default.nix @@ -19,6 +19,6 @@ buildRosPackage { The lint commands perform static checking of Python or C++ source code for errors and standards compliance.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roslisp-common/default.nix b/melodic/roslisp-common/default.nix index 5cff54ec90..ebfb11685e 100644 --- a/melodic/roslisp-common/default.nix +++ b/melodic/roslisp-common/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, actionlib-lisp, catkin, cl-tf2, roslisp-utilities, cl-transforms, cl-transforms-stamped, cl-tf, cl-utils, cl-urdf }: +{ lib, buildRosPackage, fetchurl, actionlib-lisp, catkin, cl-tf2, roslisp-utilities, cl-utils, cl-transforms, cl-tf, cl-transforms-stamped, cl-urdf }: buildRosPackage { pname = "ros-melodic-roslisp-common"; version = "0.2.10"; @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "08017837c37e5b4edb4a27ebe6c26b7468afca2ce261104cdbf22df54d044491"; }; - propagatedBuildInputs = [ cl-transforms cl-transforms-stamped cl-tf actionlib-lisp cl-tf2 roslisp-utilities cl-utils cl-urdf ]; + propagatedBuildInputs = [ actionlib-lisp cl-tf2 roslisp-utilities cl-transforms cl-transforms-stamped cl-tf cl-utils cl-urdf ]; nativeBuildInputs = [ catkin ]; meta = { @@ -20,6 +20,6 @@ buildRosPackage { an implementation of actionlib (client and server) in Common Lisp, a transformation library and an implementation of tf in Common Lisp.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roslisp-repl/default.nix b/melodic/roslisp-repl/default.nix index 0360ee927c..865710a799 100644 --- a/melodic/roslisp-repl/default.nix +++ b/melodic/roslisp-repl/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "8a3c6a1532c2cda1967b880e2a26474c04966c606d4cf5ef5a1fcbe65f2ccc7f"; }; - propagatedBuildInputs = [ slime-wrapper sbcl rosemacs roslisp slime-ros ]; + propagatedBuildInputs = [ slime-wrapper rosemacs roslisp sbcl slime-ros ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package provides a script that launches Emacs with Slime (the Superior Lisp Interaction Mode) ready for Lisp development and roslisp.''; - #license = lib.licenses.Public domain; + license = with lib.licenses; [ publicDomain ]; }; } diff --git a/melodic/roslisp-utilities/default.nix b/melodic/roslisp-utilities/default.nix index 4dfa4812f2..17a578f269 100644 --- a/melodic/roslisp-utilities/default.nix +++ b/melodic/roslisp-utilities/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Some utility functionality to interact with ROS using roslisp.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roslisp/default.nix b/melodic/roslisp/default.nix index 243f404cde..ea0f2d2a80 100644 --- a/melodic/roslisp/default.nix +++ b/melodic/roslisp/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "83844af11c1d8a5baf84efcef5a107629966d66b14973723446cd8803fc9781a"; }; - propagatedBuildInputs = [ rosgraph-msgs rospack std-srvs roslang sbcl ]; + propagatedBuildInputs = [ std-srvs rospack sbcl rosgraph-msgs roslang ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Lisp client library for ROS, the Robot Operating System.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roslz4/default.nix b/melodic/roslz4/default.nix index 9ad2ff8a11..7bfbe9eace 100644 --- a/melodic/roslz4/default.nix +++ b/melodic/roslz4/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''A Python and C++ implementation of the LZ4 streaming format. Large data streams are split into blocks which are compressed using the very fast LZ4 compression algorithm.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosmake/default.nix b/melodic/rosmake/default.nix index 5e1b4e0245..7e50950f18 100644 --- a/melodic/rosmake/default.nix +++ b/melodic/rosmake/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''rosmake is a ros dependency aware build tool which can be used to build all dependencies in the correct order.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosmaster/default.nix b/melodic/rosmaster/default.nix index 0e6aaedbb5..7b4bcf506a 100644 --- a/melodic/rosmaster/default.nix +++ b/melodic/rosmaster/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''ROS Master implementation.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosmon-core/default.nix b/melodic/rosmon-core/default.nix index 51433fbd36..80741b13a1 100644 --- a/melodic/rosmon-core/default.nix +++ b/melodic/rosmon-core/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''Node launcher and monitor for ROS. rosmon is a replacement for the roslaunch tool, focused on performance, remote monitoring, and usability.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosmon-msgs/default.nix b/melodic/rosmon-msgs/default.nix index f79f45495d..a0972bdc05 100644 --- a/melodic/rosmon-msgs/default.nix +++ b/melodic/rosmon-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Messages for rosmon, the node launcher and monitor for ROS. rosmon is a replacement for the roslaunch tool, focused on performance, remote monitoring, and usability.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosmon/default.nix b/melodic/rosmon/default.nix index dd5243820e..adcf00cda1 100644 --- a/melodic/rosmon/default.nix +++ b/melodic/rosmon/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Node launcher and monitor for ROS. rosmon is a replacement for the roslaunch tool, focused on performance, remote monitoring, and usability.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosmsg/default.nix b/melodic/rosmsg/default.nix index be25aa6280..10ca8ff2e5 100644 --- a/melodic/rosmsg/default.nix +++ b/melodic/rosmsg/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rosbag, catkin, pythonPackages, genpy, std-msgs, genmsg, roslib }: +{ lib, buildRosPackage, fetchurl, rosbag, genpy, pythonPackages, catkin, std-msgs, genmsg, roslib }: buildRosPackage { pname = "ros-melodic-rosmsg"; version = "1.14.3"; @@ -13,7 +13,7 @@ buildRosPackage { }; checkInputs = [ std-msgs ]; - propagatedBuildInputs = [ genpy catkin pythonPackages.rospkg genmsg rosbag roslib ]; + propagatedBuildInputs = [ pythonPackages.rospkg rosbag catkin genpy genmsg roslib ]; nativeBuildInputs = [ catkin ]; meta = { @@ -23,6 +23,6 @@ buildRosPackage { types. rossrv is a command-line tool for displaying information about ROS Service types.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosnode/default.nix b/melodic/rosnode/default.nix index 4e73c6808c..ae98664b71 100644 --- a/melodic/rosnode/default.nix +++ b/melodic/rosnode/default.nix @@ -22,6 +22,6 @@ buildRosPackage { including publications, subscriptions and connections. It also contains an experimental library for retrieving node information. This library is intended for internal use only.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosout/default.nix b/melodic/rosout/default.nix index b84dbe703b..574f1fe704 100644 --- a/melodic/rosout/default.nix +++ b/melodic/rosout/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''System-wide logging mechanism for messages sent to the /rosout topic.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rospack/default.nix b/melodic/rospack/default.nix index bc36383c6e..f804292c81 100644 --- a/melodic/rospack/default.nix +++ b/melodic/rospack/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "0b9db7d9b7c20d8f36204d3bda08ef5cf41f3f8f7e009862102603b9daf65429"; }; - buildInputs = [ python cmake-modules boost tinyxml-2 gtest pkg-config ]; + buildInputs = [ python cmake-modules boost gtest pkg-config tinyxml-2 ]; checkInputs = [ pythonPackages.coverage ]; - propagatedBuildInputs = [ python ros-environment boost tinyxml-2 pythonPackages.rosdep pythonPackages.catkin-pkg pkg-config ]; + propagatedBuildInputs = [ python ros-environment boost pythonPackages.rosdep pkg-config tinyxml-2 pythonPackages.catkin-pkg ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS Package Tool''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosparam-shortcuts/default.nix b/melodic/rosparam-shortcuts/default.nix index 6664337e39..91c2d185b3 100644 --- a/melodic/rosparam-shortcuts/default.nix +++ b/melodic/rosparam-shortcuts/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Quickly load variables from rosparam with good command line error checking.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosparam/default.nix b/melodic/rosparam/default.nix index 4fd47cbf0e..34573c0f52 100644 --- a/melodic/rosparam/default.nix +++ b/melodic/rosparam/default.nix @@ -23,6 +23,6 @@ buildRosPackage { Server. This library is intended for internal use only. rosparam can be invoked within a roslaunch file.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rospatlite/default.nix b/melodic/rospatlite/default.nix index 19f1d7da6a..43c8a529ae 100644 --- a/melodic/rospatlite/default.nix +++ b/melodic/rospatlite/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''rospatlite''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosping/default.nix b/melodic/rosping/default.nix index 1837431c90..e4efdf6c85 100644 --- a/melodic/rosping/default.nix +++ b/melodic/rosping/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "3a791764a80f3b660e57428d8274ecf2b13fefbb7959080aa035f7f8d16a0b35"; }; - buildInputs = [ rostest rosboost-cfg std-msgs mk rosbuild roscpp ]; + buildInputs = [ rosboost-cfg mk rosbuild rostest std-msgs roscpp ]; propagatedBuildInputs = [ std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rosping is the tool to send ICMP ECHO_REQUEST to network hosts where roscore is running, and send back to you as rostopic message.
    For echoing ROS node, use rosnode.''; - #license = lib.licenses.Boost Software License, Version 1.0; + license = with lib.licenses; [ boost ]; }; } diff --git a/melodic/rospy-message-converter/default.nix b/melodic/rospy-message-converter/default.nix index e584cdf933..dc07ca39af 100644 --- a/melodic/rospy-message-converter/default.nix +++ b/melodic/rospy-message-converter/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Converts between Python dictionaries and JSON to rospy messages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rospy-tutorials/default.nix b/melodic/rospy-tutorials/default.nix index f042c37f86..38541aadd4 100644 --- a/melodic/rospy-tutorials/default.nix +++ b/melodic/rospy-tutorials/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package attempts to show the features of ROS python API step-by-step, including using messages, servers, parameters, etc. These tutorials are compatible with the nodes in roscpp_tutorial.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rospy/default.nix b/melodic/rospy/default.nix index fd44fa2498..8f41c51625 100644 --- a/melodic/rospy/default.nix +++ b/melodic/rospy/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages, roscpp, rosgraph-msgs, roslib, rosgraph, std-msgs, genpy }: +{ lib, buildRosPackage, fetchurl, catkin, pythonPackages, genpy, rosgraph-msgs, roslib, rosgraph, std-msgs, roscpp }: buildRosPackage { pname = "ros-melodic-rospy"; version = "1.14.3"; @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "3dbd699e3d8cea6b5fc18d98d184a1aedb4171a0eca3cd9ba280f320b3607468"; }; - propagatedBuildInputs = [ pythonPackages.numpy pythonPackages.rospkg genpy roscpp pythonPackages.pyyaml rosgraph-msgs rosgraph std-msgs roslib ]; + propagatedBuildInputs = [ pythonPackages.numpy pythonPackages.rospkg roscpp pythonPackages.pyyaml rosgraph-msgs roslib rosgraph std-msgs genpy ]; nativeBuildInputs = [ catkin ]; meta = { @@ -29,6 +29,6 @@ buildRosPackage { as rostopic and rosservice, are built on top of rospy.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosrt/default.nix b/melodic/rosrt/default.nix index c0aacf73fe..dd02633f98 100644 --- a/melodic/rosrt/default.nix +++ b/melodic/rosrt/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "ab1cb91949e270a78898a6d03547538b9c4da40d82d9da354cda672ba8585f11"; }; - buildInputs = [ roslib rosatomic std-msgs rosunit lockfree roscpp allocators ]; - propagatedBuildInputs = [ roslib rosatomic std-msgs rosunit lockfree roscpp allocators ]; + buildInputs = [ rosatomic allocators roslib std-msgs lockfree roscpp rosunit ]; + propagatedBuildInputs = [ rosatomic allocators roslib std-msgs lockfree roscpp rosunit ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rosrt provides classes for interfacing with ROS from within realtime systems, such as realtime-safe Publisher and Subscriber classes.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial-arduino/default.nix b/melodic/rosserial-arduino/default.nix index cdabb3dee0..dcfaa5db9b 100644 --- a/melodic/rosserial-arduino/default.nix +++ b/melodic/rosserial-arduino/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ message-generation ]; - propagatedBuildInputs = [ rosserial-python message-runtime rosserial-client rospy arduino rosserial-msgs ]; + propagatedBuildInputs = [ rosserial-python arduino rosserial-msgs message-runtime rospy rosserial-client ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rosserial for Arduino/AVR platforms.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial-client/default.nix b/melodic/rosserial-client/default.nix index a06b0fcd78..978e1aad13 100644 --- a/melodic/rosserial-client/default.nix +++ b/melodic/rosserial-client/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; checkInputs = [ rosserial-msgs rosunit ]; - propagatedBuildInputs = [ rosbash rospy std-msgs tf rosserial-msgs ]; + propagatedBuildInputs = [ rosbash rosserial-msgs rospy std-msgs tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Generalized client side source for rosserial.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial-embeddedlinux/default.nix b/melodic/rosserial-embeddedlinux/default.nix index 6ba830ea2a..5a1c82a166 100644 --- a/melodic/rosserial-embeddedlinux/default.nix +++ b/melodic/rosserial-embeddedlinux/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''rosserial for embedded Linux enviroments''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial-mbed/default.nix b/melodic/rosserial-mbed/default.nix index 94ef9768a7..b27910f503 100644 --- a/melodic/rosserial-mbed/default.nix +++ b/melodic/rosserial-mbed/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''rosserial for mbed platforms.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial-msgs/default.nix b/melodic/rosserial-msgs/default.nix index c8e32aa1cf..0b5f698b73 100644 --- a/melodic/rosserial-msgs/default.nix +++ b/melodic/rosserial-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages for automatic topic configuration using rosserial.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial-python/default.nix b/melodic/rosserial-python/default.nix index b0a2e93e80..21ec505ec3 100644 --- a/melodic/rosserial-python/default.nix +++ b/melodic/rosserial-python/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A Python-based implementation of the rosserial protocol.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial-server/default.nix b/melodic/rosserial-server/default.nix index 2f53cad960..70f800bb88 100644 --- a/melodic/rosserial-server/default.nix +++ b/melodic/rosserial-server/default.nix @@ -13,12 +13,12 @@ buildRosPackage { }; buildInputs = [ topic-tools roscpp rosserial-msgs std-msgs ]; - propagatedBuildInputs = [ rosserial-python std-msgs topic-tools rosserial-msgs roscpp ]; + propagatedBuildInputs = [ rosserial-python topic-tools rosserial-msgs std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A more performance- and stability-oriented server alternative implemented in C++ to rosserial_python.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial-tivac/default.nix b/melodic/rosserial-tivac/default.nix index d3c8bea26a..e74cfefe0a 100644 --- a/melodic/rosserial-tivac/default.nix +++ b/melodic/rosserial-tivac/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''rosserial for TivaC Launchpad evaluation boards.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial-vex-cortex/default.nix b/melodic/rosserial-vex-cortex/default.nix index 2f51abfcee..f1ae02137c 100644 --- a/melodic/rosserial-vex-cortex/default.nix +++ b/melodic/rosserial-vex-cortex/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''rosserial for Cortex/AVR platforms.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial-vex-v5/default.nix b/melodic/rosserial-vex-v5/default.nix index 887fdbd829..15ef0763e2 100644 --- a/melodic/rosserial-vex-v5/default.nix +++ b/melodic/rosserial-vex-v5/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''rosserial for the VEX Cortex V5 Robot Brain platform.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial-windows/default.nix b/melodic/rosserial-windows/default.nix index 351a088ed8..cf00b3306b 100644 --- a/melodic/rosserial-windows/default.nix +++ b/melodic/rosserial-windows/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "620b3a46eb5abe13e626c55510ee6175e35b0548be995208f0b062cbb02c7089"; }; - buildInputs = [ nav-msgs rosserial-client std-msgs sensor-msgs geometry-msgs ]; + buildInputs = [ sensor-msgs nav-msgs rosserial-client std-msgs geometry-msgs ]; propagatedBuildInputs = [ rospy rosserial-msgs message-runtime rosserial-client ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rosserial for Windows platforms.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial-xbee/default.nix b/melodic/rosserial-xbee/default.nix index b7c7781b54..1e1bb057c4 100644 --- a/melodic/rosserial-xbee/default.nix +++ b/melodic/rosserial-xbee/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "6efbc90d56bf2d6caad0e830fe206c9c7cb3c1edfe08507caf2721589f5d7a5b"; }; - propagatedBuildInputs = [ pythonPackages.pyserial rosserial-python rospy diagnostic-msgs rosserial-msgs ]; + propagatedBuildInputs = [ pythonPackages.pyserial rosserial-python rosserial-msgs rospy diagnostic-msgs ]; nativeBuildInputs = [ catkin ]; meta = { @@ -24,6 +24,6 @@ buildRosPackage { This pkg includes python code from the python-xbee project: http://code.google.com/p/python-xbee/''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosserial/default.nix b/melodic/rosserial/default.nix index 08a41286d0..787d8926e8 100644 --- a/melodic/rosserial/default.nix +++ b/melodic/rosserial/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Metapackage for core of rosserial.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosservice/default.nix b/melodic/rosservice/default.nix index 52eab44e3d..18915af86a 100644 --- a/melodic/rosservice/default.nix +++ b/melodic/rosservice/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "3c702a38cbf823bf15ade07745f11dd6b19af38b936630dbadb3473aea130e36"; }; - propagatedBuildInputs = [ roslib rosgraph rosmsg rospy genpy ]; + propagatedBuildInputs = [ genpy rosmsg rosgraph rospy roslib ]; nativeBuildInputs = [ catkin ]; meta = { @@ -21,6 +21,6 @@ buildRosPackage { contains a Python library for retrieving information about Services and dynamically invoking them. The Python library is experimental and is for internal-use only.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rostate-machine/default.nix b/melodic/rostate-machine/default.nix index 55adc68504..901704e122 100644 --- a/melodic/rostate-machine/default.nix +++ b/melodic/rostate-machine/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "a7eae9ee6371319fc4b598f00322101431141a52b07ed6ef2c0ee5588a050253"; }; - buildInputs = [ rostest message-generation rospy std-msgs roslib roscpp ]; - propagatedBuildInputs = [ rostest message-runtime rospy std-msgs roslib roscpp ]; + buildInputs = [ roscpp rostest message-generation rospy std-msgs roslib ]; + propagatedBuildInputs = [ roscpp rostest message-runtime rospy std-msgs roslib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The rostate_machine package''; - #license = lib.licenses.Apache v2; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/rostest/default.nix b/melodic/rostest/default.nix index 984b9e66c8..b4be54da14 100644 --- a/melodic/rostest/default.nix +++ b/melodic/rostest/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ rosunit boost ]; - propagatedBuildInputs = [ rosmaster rosgraph boost rospy roslaunch rosunit ]; + propagatedBuildInputs = [ rosmaster boost rosgraph rospy roslaunch rosunit ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Integration test suite based on roslaunch that is compatible with xUnit frameworks.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rostime/default.nix b/melodic/rostime/default.nix index 1411030601..98c3880a7f 100644 --- a/melodic/rostime/default.nix +++ b/melodic/rostime/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Time and Duration implementations for C++ libraries, including roscpp.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rostopic/default.nix b/melodic/rostopic/default.nix index 335ef7e7e2..04880b1989 100644 --- a/melodic/rostopic/default.nix +++ b/melodic/rostopic/default.nix @@ -27,6 +27,6 @@ buildRosPackage { internal-use only as the code API may change, though it does provide examples of how to implement dynamic subscription and publication behaviors in ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rosunit/default.nix b/melodic/rosunit/default.nix index e568110a94..74f628b615 100644 --- a/melodic/rosunit/default.nix +++ b/melodic/rosunit/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Unit-testing package for ROS. This is a lower-level library for rostest and handles unit tests, whereas rostest handles integration tests.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roswtf/default.nix b/melodic/roswtf/default.nix index 2a17e0ee87..7d79cd5d22 100644 --- a/melodic/roswtf/default.nix +++ b/melodic/roswtf/default.nix @@ -14,11 +14,11 @@ buildRosPackage { buildInputs = [ rostest ]; checkInputs = [ std-srvs rosbag cmake-modules ]; - propagatedBuildInputs = [ roslib pythonPackages.rospkg rosgraph pythonPackages.paramiko roslaunch rosbuild rosservice rosnode ]; + propagatedBuildInputs = [ pythonPackages.rospkg rosbuild rosservice rosgraph pythonPackages.paramiko roslaunch roslib rosnode ]; nativeBuildInputs = [ catkin ]; meta = { description = ''roswtf is a tool for diagnosing issues with a running ROS system. Think of it as a FAQ implemented in code.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/roswww/default.nix b/melodic/roswww/default.nix index 5042ade2fe..e5ab070cc1 100644 --- a/melodic/roswww/default.nix +++ b/melodic/roswww/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Feathery lightweight web server for ROS, that is based on Tornado web server module.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rotate-recovery/default.nix b/melodic/rotate-recovery/default.nix index 305f12729c..16e99ae641 100644 --- a/melodic/rotate-recovery/default.nix +++ b/melodic/rotate-recovery/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, costmap-2d, pluginlib, base-local-planner, cmake-modules, tf2-geometry-msgs, nav-core, catkin, tf2-ros, tf2, eigen, angles, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, costmap-2d, pluginlib, base-local-planner, cmake-modules, tf2-geometry-msgs, nav-core, catkin, tf2-ros, tf2, angles, roscpp, geometry-msgs, eigen }: buildRosPackage { pname = "ros-melodic-rotate-recovery"; version = "1.16.2"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "c16310caacd9352ba89b5eb4903bb43349ee2b781b77157a33df6cfa39bc6a07"; }; - buildInputs = [ costmap-2d cmake-modules base-local-planner pluginlib tf2-geometry-msgs nav-core tf2-ros tf2 angles roscpp geometry-msgs eigen ]; + buildInputs = [ costmap-2d cmake-modules base-local-planner pluginlib tf2-geometry-msgs nav-core tf2-ros tf2 eigen angles roscpp geometry-msgs ]; propagatedBuildInputs = [ costmap-2d pluginlib tf2-geometry-msgs nav-core tf2-ros tf2 eigen roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package provides a recovery behavior for the navigation stack that attempts to clear space by performing a 360 degree rotation of the robot.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rotors-comm/default.nix b/melodic/rotors-comm/default.nix index f794850bc7..8d1b8df6d2 100644 --- a/melodic/rotors-comm/default.nix +++ b/melodic/rotors-comm/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "6f5fc3033ab80590b10c00fc416c36221be5abd5756b389577e5f3e13dbb346c"; }; - buildInputs = [ message-generation message-runtime cmake-modules geometry-msgs octomap-msgs ]; - propagatedBuildInputs = [ message-generation message-runtime cmake-modules geometry-msgs octomap-msgs ]; + buildInputs = [ cmake-modules octomap-msgs message-generation message-runtime geometry-msgs ]; + propagatedBuildInputs = [ cmake-modules octomap-msgs message-generation message-runtime geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''RotorS specific messages and services.''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/rotors-control/default.nix b/melodic/rotors-control/default.nix index ea70249eb4..4702e65949 100644 --- a/melodic/rotors-control/default.nix +++ b/melodic/rotors-control/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "360134fe15fab3cd01a1869458c0d767006f445a2124532ac6b0c2484e4cc38f"; }; - buildInputs = [ nav-msgs cmake-modules dynamic-reconfigure mav-msgs sensor-msgs roscpp geometry-msgs ]; - propagatedBuildInputs = [ nav-msgs cmake-modules dynamic-reconfigure mav-msgs sensor-msgs roscpp geometry-msgs ]; + buildInputs = [ cmake-modules mav-msgs sensor-msgs nav-msgs dynamic-reconfigure roscpp geometry-msgs ]; + propagatedBuildInputs = [ cmake-modules mav-msgs sensor-msgs nav-msgs dynamic-reconfigure roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''RotorS control package''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/rotors-description/default.nix b/melodic/rotors-description/default.nix index 781695734e..b6fd073745 100644 --- a/melodic/rotors-description/default.nix +++ b/melodic/rotors-description/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''The rotors_description package provides URDF models of the AscTec multicopters.''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/rotors-evaluation/default.nix b/melodic/rotors-evaluation/default.nix index 42eed9e141..366aedb3ab 100644 --- a/melodic/rotors-evaluation/default.nix +++ b/melodic/rotors-evaluation/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The dataset evaluation package for the RotorS simulator.''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/rotors-gazebo-plugins/default.nix b/melodic/rotors-gazebo-plugins/default.nix index e96e1d99bb..e31afc57eb 100644 --- a/melodic/rotors-gazebo-plugins/default.nix +++ b/melodic/rotors-gazebo-plugins/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "9a4fc0b6f45d9fe43292fa7b4656ea3190c32928c36b33aee9adfaa0c3fafcd2"; }; - buildInputs = [ gazebo-ros std-srvs gazeboSimulator.gazebo rosbag cv-bridge octomap-msgs gazebo-plugins octomap protobuf roscpp tf geometry-msgs cmake-modules libyamlcpp mav-msgs mavros rotors-control octomap-ros rotors-comm glog ]; - propagatedBuildInputs = [ gazebo-ros std-srvs gazeboSimulator.gazebo rosbag cv-bridge octomap-msgs gazebo-plugins octomap protobuf roscpp tf geometry-msgs cmake-modules libyamlcpp mav-msgs mavros rotors-control octomap-ros rotors-comm glog ]; + buildInputs = [ gazeboSimulator.gazebo cv-bridge gazebo-plugins octomap tf geometry-msgs mav-msgs mavros octomap-ros glog gazebo-ros std-srvs rosbag octomap-msgs protobuf roscpp cmake-modules libyamlcpp rotors-control rotors-comm ]; + propagatedBuildInputs = [ gazeboSimulator.gazebo cv-bridge gazebo-plugins octomap tf geometry-msgs mav-msgs mavros octomap-ros glog gazebo-ros std-srvs rosbag octomap-msgs protobuf roscpp cmake-modules libyamlcpp rotors-control rotors-comm ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The rotors_gazebo_plugins package''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/rotors-gazebo/default.nix b/melodic/rotors-gazebo/default.nix index deeb41de44..ffbfe7be87 100644 --- a/melodic/rotors-gazebo/default.nix +++ b/melodic/rotors-gazebo/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, mav-msgs, sensor-msgs, catkin, joy, rotors-gazebo-plugins, gazebo-msgs, gazebo-plugins, roscpp, xacro, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, mav-msgs, sensor-msgs, joy, catkin, gazebo-msgs, roscpp, gazebo-plugins, rotors-gazebo-plugins, xacro, geometry-msgs }: buildRosPackage { pname = "ros-melodic-rotors-gazebo"; version = "2.2.3"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "98425c45ee4f84bc43c033c786ad18ea897efda6616cca43f24ad38b3cc5083b"; }; - buildInputs = [ geometry-msgs mav-msgs sensor-msgs joy roscpp gazebo-plugins rotors-gazebo-plugins xacro gazebo-msgs ]; - propagatedBuildInputs = [ geometry-msgs mav-msgs sensor-msgs joy roscpp gazebo-plugins rotors-gazebo-plugins xacro gazebo-msgs ]; + buildInputs = [ geometry-msgs mav-msgs sensor-msgs joy rotors-gazebo-plugins gazebo-plugins roscpp xacro gazebo-msgs ]; + propagatedBuildInputs = [ geometry-msgs mav-msgs sensor-msgs joy rotors-gazebo-plugins gazebo-plugins roscpp xacro gazebo-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The rotors_gazebo package''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/rotors-hil-interface/default.nix b/melodic/rotors-hil-interface/default.nix index 0f2e314e84..3c53230a54 100644 --- a/melodic/rotors-hil-interface/default.nix +++ b/melodic/rotors-hil-interface/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "ee4f035b44afcf982354c3740f05087f5dc9c8f2fffee6816a5e9dc435d46fc5"; }; - buildInputs = [ cmake-modules geometry-msgs mav-msgs sensor-msgs mavros mavros-msgs roscpp ]; - propagatedBuildInputs = [ geometry-msgs mav-msgs sensor-msgs mavros mavros-msgs roscpp ]; + buildInputs = [ cmake-modules mav-msgs sensor-msgs mavros roscpp mavros-msgs geometry-msgs ]; + propagatedBuildInputs = [ mav-msgs sensor-msgs mavros roscpp mavros-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''RotorS Hardware-in-the-loop interface package''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/rotors-joy-interface/default.nix b/melodic/rotors-joy-interface/default.nix index d4270429d6..ab2aa28f08 100644 --- a/melodic/rotors-joy-interface/default.nix +++ b/melodic/rotors-joy-interface/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The rotors_joy_interface package to control MAVs with a joystick''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/rotors-simulator/default.nix b/melodic/rotors-simulator/default.nix index c82fbda3c1..1722722307 100644 --- a/melodic/rotors-simulator/default.nix +++ b/melodic/rotors-simulator/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''RotorS is a MAV gazebo simulator.''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/rplidar-ros/default.nix b/melodic/rplidar-ros/default.nix index a73d38c0f5..36c45fef15 100644 --- a/melodic/rplidar-ros/default.nix +++ b/melodic/rplidar-ros/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The rplidar ros package, support rplidar A2/A1 and A3''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-action/default.nix b/melodic/rqt-action/default.nix index b6bb64e16a..1da12cbec4 100644 --- a/melodic/rqt-action/default.nix +++ b/melodic/rqt-action/default.nix @@ -21,6 +21,6 @@ buildRosPackage { unified with it and rqt_srv. Note that the actions shown on this plugin is the ones that are stored on your machine, not on the ROS core your rqt instance connects to.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-bag-plugins/default.nix b/melodic/rqt-bag-plugins/default.nix index 4acd996493..f1af50d95e 100644 --- a/melodic/rqt-bag-plugins/default.nix +++ b/melodic/rqt-bag-plugins/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''rqt_bag provides a GUI plugin for displaying and replaying ROS bag files.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-bag/default.nix b/melodic/rqt-bag/default.nix index ccb610254a..f7351dc0c7 100644 --- a/melodic/rqt-bag/default.nix +++ b/melodic/rqt-bag/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''rqt_bag provides a GUI plugin for displaying and replaying ROS bag files.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-common-plugins/default.nix b/melodic/rqt-common-plugins/default.nix index 4b8ccbacfd..4034aea09a 100644 --- a/melodic/rqt-common-plugins/default.nix +++ b/melodic/rqt-common-plugins/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "f0c64a0ec07274960b5e4eb9c032c6c439e67a82b0ae25c4cc9d27be2ecacc83"; }; - propagatedBuildInputs = [ rqt-srv rqt-action rqt-web rqt-topic rqt-launch rqt-py-console rqt-publisher rqt-bag rqt-msg rqt-console rqt-plot rqt-shell rqt-dep rqt-logger-level rqt-graph rqt-reconfigure rqt-top rqt-service-caller rqt-py-common rqt-image-view rqt-bag-plugins ]; + propagatedBuildInputs = [ rqt-srv rqt-launch rqt-py-console rqt-bag rqt-msg rqt-plot rqt-shell rqt-graph rqt-reconfigure rqt-top rqt-image-view rqt-action rqt-web rqt-topic rqt-publisher rqt-console rqt-dep rqt-logger-level rqt-service-caller rqt-py-common rqt-bag-plugins ]; nativeBuildInputs = [ catkin ]; meta = { @@ -27,6 +27,6 @@ buildRosPackage {
  • rqt_robot_plugins - rqt plugins that are particularly used with robots during their runtime.


    • ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-console/default.nix b/melodic/rqt-console/default.nix index d5d6d87565..26305a0701 100644 --- a/melodic/rqt-console/default.nix +++ b/melodic/rqt-console/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rqt-gui-py, rqt-gui, catkin, rqt-logger-level, pythonPackages, rospy, rqt-py-common, roslib, python-qt-binding }: +{ lib, buildRosPackage, fetchurl, rqt-gui-py, catkin, rqt-gui, pythonPackages, rqt-logger-level, rospy, rqt-py-common, roslib, python-qt-binding }: buildRosPackage { pname = "ros-melodic-rqt-console"; version = "0.4.8"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "bd66d6c711910fb8db8804b403bf5cedcce83ecfc82eaa4c12afb5e035a6eeb3"; }; - propagatedBuildInputs = [ rqt-gui-py roslib rqt-logger-level rospy pythonPackages.rospkg rqt-py-common rqt-gui python-qt-binding ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-gui rqt-logger-level rospy rqt-py-common roslib python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_console provides a GUI plugin for displaying and filtering ROS messages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-controller-manager/default.nix b/melodic/rqt-controller-manager/default.nix index 6fcd4d7c7b..4929bb8591 100644 --- a/melodic/rqt-controller-manager/default.nix +++ b/melodic/rqt-controller-manager/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The rqt_controller_manager package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-dep/default.nix b/melodic/rqt-dep/default.nix index c9c86d05d5..bd579e8bab 100644 --- a/melodic/rqt-dep/default.nix +++ b/melodic/rqt-dep/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; checkInputs = [ pythonPackages.mock ]; - propagatedBuildInputs = [ rqt-gui-py qt-gui qt-dotgraph qt-gui-py-common python-qt-binding pythonPackages.rospkg rqt-graph ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-graph qt-gui qt-dotgraph qt-gui-py-common python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_dep provides a GUI plugin for visualizing the ROS dependency graph.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-graph/default.nix b/melodic/rqt-graph/default.nix index c819b0ad70..ee8709c9b3 100644 --- a/melodic/rqt-graph/default.nix +++ b/melodic/rqt-graph/default.nix @@ -22,6 +22,6 @@ buildRosPackage { where you want to achieve graph representation can depend upon this pkg (use rqt_dep to find out the pkgs that depend. rqt_dep itself depends on rqt_graph too).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-gui-cpp/default.nix b/melodic/rqt-gui-cpp/default.nix index 168e68305d..73956ebbdc 100644 --- a/melodic/rqt-gui-cpp/default.nix +++ b/melodic/rqt-gui-cpp/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "29dd122311b73050bde2957210a6523688298a3c1993833b78ef18b80a671603"; }; - buildInputs = [ qt-gui-cpp roscpp qt-gui nodelet qt5.qtbase ]; + buildInputs = [ qt5.qtbase qt-gui-cpp qt-gui nodelet roscpp ]; propagatedBuildInputs = [ qt-gui-cpp roscpp qt-gui nodelet ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_gui_cpp enables GUI plugins to use the C++ client library for ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-gui-py/default.nix b/melodic/rqt-gui-py/default.nix index 0d354d3e18..5f16536f65 100644 --- a/melodic/rqt-gui-py/default.nix +++ b/melodic/rqt-gui-py/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''rqt_gui_py enables GUI plugins to use the Python client library for ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-gui/default.nix b/melodic/rqt-gui/default.nix index e8de21addb..d88f1f989a 100644 --- a/melodic/rqt-gui/default.nix +++ b/melodic/rqt-gui/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''rqt_gui provides the main to start an instance of the ROS integrated graphical user interface provided by qt_gui.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-image-view/default.nix b/melodic/rqt-image-view/default.nix index a57d86186a..afb86c3c7a 100644 --- a/melodic/rqt-image-view/default.nix +++ b/melodic/rqt-image-view/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "adbd60be7c1f3517942285d3bcb166f838d362e88a910192bdaa35dc193126e3"; }; - buildInputs = [ cv-bridge rqt-gui-cpp geometry-msgs image-transport sensor-msgs rqt-gui qt5.qtbase ]; - propagatedBuildInputs = [ cv-bridge rqt-gui-cpp image-transport sensor-msgs rqt-gui geometry-msgs ]; + buildInputs = [ image-transport sensor-msgs rqt-gui cv-bridge qt5.qtbase rqt-gui-cpp geometry-msgs ]; + propagatedBuildInputs = [ image-transport sensor-msgs rqt-gui cv-bridge rqt-gui-cpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_image_view provides a GUI plugin for displaying images using image_transport.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-joint-trajectory-controller/default.nix b/melodic/rqt-joint-trajectory-controller/default.nix index d3ee9c82d9..294eeb2db3 100644 --- a/melodic/rqt-joint-trajectory-controller/default.nix +++ b/melodic/rqt-joint-trajectory-controller/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "469f85d30f031dece7a2077959de20084d813282ce05d007ba6296f991e68763"; }; - propagatedBuildInputs = [ rqt-gui-py controller-manager-msgs control-msgs rospy trajectory-msgs rqt-gui ]; + propagatedBuildInputs = [ rqt-gui-py control-msgs trajectory-msgs rqt-gui controller-manager-msgs rospy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Graphical frontend for interacting with joint_trajectory_controller instances.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-launch/default.nix b/melodic/rqt-launch/default.nix index 8ae6c6076e..c41eaef061 100644 --- a/melodic/rqt-launch/default.nix +++ b/melodic/rqt-launch/default.nix @@ -13,12 +13,12 @@ buildRosPackage { }; buildInputs = [ rqt-py-common ]; - propagatedBuildInputs = [ roslaunch rqt-gui-py rqt-console rospy rqt-py-common rqt-gui python-qt-binding ]; + propagatedBuildInputs = [ roslaunch rqt-gui-py rqt-gui rqt-console rospy rqt-py-common python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This rqt plugin ROS package provides easy view of .launch files. User can also start and end node by node that are defined in those files.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-logger-level/default.nix b/melodic/rqt-logger-level/default.nix index cf80bc48c1..5d54af8ba4 100644 --- a/melodic/rqt-logger-level/default.nix +++ b/melodic/rqt-logger-level/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "c2fcc66a3b20e836aba40218bc745f0112986d329804f3929c275534d907a4b9"; }; - propagatedBuildInputs = [ rqt-gui-py rospy pythonPackages.rospkg rqt-gui python-qt-binding rosservice rosnode ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-gui rosservice rospy python-qt-binding rosnode ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_logger_level provides a GUI plugin for configuring the logger level of ROS nodes.

    rqt_logger_level takes over `wx`-based tool [[rxloggerlevel]].''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-moveit/default.nix b/melodic/rqt-moveit/default.nix index 0a013fa05a..95b78dfa8d 100644 --- a/melodic/rqt-moveit/default.nix +++ b/melodic/rqt-moveit/default.nix @@ -30,6 +30,6 @@ buildRosPackage { Since this package is not made by the MoveIt! development team (although with assistance from the them), please post issue reports to the designated tracker (not MoveIt!'s main tracker).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-msg/default.nix b/melodic/rqt-msg/default.nix index 6fd87b909d..a156480c75 100644 --- a/melodic/rqt-msg/default.nix +++ b/melodic/rqt-msg/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rqt-gui-py, rqt-gui, catkin, rosmsg, pythonPackages, rqt-console, rospy, rqt-py-common, roslib, python-qt-binding }: +{ lib, buildRosPackage, fetchurl, rqt-gui-py, catkin, rqt-gui, pythonPackages, rosmsg, rqt-console, rospy, rqt-py-common, roslib, python-qt-binding }: buildRosPackage { pname = "ros-melodic-rqt-msg"; version = "0.4.8"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "ec3e88d3c822856ace98a11ab03950fb0e9390829122b7abfabc863180611630"; }; - propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rosmsg rqt-gui rqt-console rospy rqt-py-common roslib python-qt-binding ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-gui rosmsg rqt-console rospy rqt-py-common roslib python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A Python GUI plugin for introspecting available ROS message types. Note that the msgs available through this plugin is the ones that are stored on your machine, not on the ROS core your rqt instance connects to.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-multiplot/default.nix b/melodic/rqt-multiplot/default.nix index 7eda39063c..2e23807fdb 100644 --- a/melodic/rqt-multiplot/default.nix +++ b/melodic/rqt-multiplot/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "92e975517c6726dcd8a9c73c658d524126d48716bd4db032cec61f641ce27ae8"; }; - buildInputs = [ roscpp rqt-gui-cpp qwt6 variant-topic-tools rosbag rqt-gui qt5.qtbase ]; - propagatedBuildInputs = [ roscpp rqt-gui-cpp qwt6 variant-topic-tools rosbag rqt-gui qt5.qtbase ]; + buildInputs = [ rosbag rqt-gui qt5.qtbase rqt-gui-cpp qwt6 variant-topic-tools roscpp ]; + propagatedBuildInputs = [ rosbag rqt-gui qt5.qtbase rqt-gui-cpp qwt6 variant-topic-tools roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_multiplot provides a GUI plugin for visualizing numeric values in multiple 2D plots using the Qwt plotting backend.''; - #license = lib.licenses.GNU Lesser General Public License (LGPL); + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/rqt-nav-view/default.nix b/melodic/rqt-nav-view/default.nix index 35e651b0d9..b77d1b2939 100644 --- a/melodic/rqt-nav-view/default.nix +++ b/melodic/rqt-nav-view/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''rqt_nav_view provides a gui for viewing navigation maps and paths.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-plot/default.nix b/melodic/rqt-plot/default.nix index 59575be927..edc1f35573 100644 --- a/melodic/rqt-plot/default.nix +++ b/melodic/rqt-plot/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rqt-gui-py, qwt-dependency, rqt-gui, pythonPackages, catkin, rosgraph, rostopic, qt-gui-py-common, std-msgs, rqt-py-common, python-qt-binding }: +{ lib, buildRosPackage, fetchurl, rqt-gui-py, python-qt-binding, qwt-dependency, catkin, rqt-gui, pythonPackages, rosgraph, rostopic, std-msgs, rqt-py-common, qt-gui-py-common }: buildRosPackage { pname = "ros-melodic-rqt-plot"; version = "0.4.9"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "226ffb18dfbf7e879f20e2aecae2243582a4fae28e74a1f7d3b291e68f6a28fb"; }; - propagatedBuildInputs = [ rqt-gui-py pythonPackages.numpy python-qt-binding pythonPackages.rospkg qwt-dependency rqt-gui rosgraph rostopic std-msgs rqt-py-common qt-gui-py-common pythonPackages.matplotlib ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.numpy pythonPackages.rospkg qwt-dependency rqt-gui qt-gui-py-common rosgraph rostopic std-msgs rqt-py-common python-qt-binding pythonPackages.matplotlib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_plot provides a GUI plugin visualizing numeric values in a 2D plot using different plotting backends.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-pose-view/default.nix b/melodic/rqt-pose-view/default.nix index a4b2f0abb1..5301d2db41 100644 --- a/melodic/rqt-pose-view/default.nix +++ b/melodic/rqt-pose-view/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''rqt_pose_view provides a GUI plugin for visualizing 3D poses.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-publisher/default.nix b/melodic/rqt-publisher/default.nix index a5388c595b..068d4161d5 100644 --- a/melodic/rqt-publisher/default.nix +++ b/melodic/rqt-publisher/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rqt-gui-py, rqt-gui, pythonPackages, rosmsg, catkin, qt-gui-py-common, rqt-py-common, roslib, python-qt-binding }: +{ lib, buildRosPackage, fetchurl, rqt-gui-py, python-qt-binding, catkin, rqt-gui, pythonPackages, rosmsg, rqt-py-common, roslib, qt-gui-py-common }: buildRosPackage { pname = "ros-melodic-rqt-publisher"; version = "0.4.8"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "9411fa1eb8fefee5ab7653c83dc2baa44cf352797759436fdfaa48de29e098e3"; }; - propagatedBuildInputs = [ rqt-gui-py roslib qt-gui-py-common rosmsg pythonPackages.rospkg rqt-py-common rqt-gui python-qt-binding ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-gui rosmsg qt-gui-py-common rqt-py-common roslib python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_publisher provides a GUI plugin for publishing arbitrary messages with fixed or computed field values.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-py-common/default.nix b/melodic/rqt-py-common/default.nix index a87a02c9e6..f9831652df 100644 --- a/melodic/rqt-py-common/default.nix +++ b/melodic/rqt-py-common/default.nix @@ -13,7 +13,7 @@ buildRosPackage { }; buildInputs = [ std-msgs genmsg ]; - propagatedBuildInputs = [ roslib qt-gui rostopic actionlib rospy rosbag genpy python-qt-binding ]; + propagatedBuildInputs = [ rosbag roslib qt-gui rostopic actionlib rospy genpy python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { @@ -24,6 +24,6 @@ buildRosPackage { Functionality included in this package should cover generic ROS concepts and should not introduce any special dependencies beside "ros_base".''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-py-console/default.nix b/melodic/rqt-py-console/default.nix index 92440e88c9..8689010f62 100644 --- a/melodic/rqt-py-console/default.nix +++ b/melodic/rqt-py-console/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "0c5714fce4f464fa175e42a7c8fc0ced483fdcfbd90cf4c8584f40b3cf208242"; }; - propagatedBuildInputs = [ rqt-gui-py qt-gui qt-gui-py-common rospy pythonPackages.rospkg rqt-gui python-qt-binding ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-gui qt-gui qt-gui-py-common rospy python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_py_console is a Python GUI plugin providing an interactive Python console.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-py-trees/default.nix b/melodic/rqt-py-trees/default.nix index cd3ad4cb2d..7b77a5f682 100644 --- a/melodic/rqt-py-trees/default.nix +++ b/melodic/rqt-py-trees/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''rqt_py_trees provides a GUI plugin for visualizing py_trees behaviour trees based on rqt_tf_tree.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-reconfigure/default.nix b/melodic/rqt-reconfigure/default.nix index f1c9fa19c8..1e23cf21c9 100644 --- a/melodic/rqt-reconfigure/default.nix +++ b/melodic/rqt-reconfigure/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "7dfe332ee9d603a0981832a698c817c14b0fa00c3cc0de4ab7a6676c90d598b4"; }; - propagatedBuildInputs = [ rqt-gui-py rqt-console dynamic-reconfigure rospy rqt-py-common rqt-gui python-qt-binding ]; + propagatedBuildInputs = [ rqt-gui-py rqt-gui rqt-console dynamic-reconfigure rospy rqt-py-common python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { @@ -26,6 +26,6 @@ buildRosPackage { However, currently as the name indicates, this pkg solely is dependent on dynamic_reconfigure that allows access to only those params latched to nodes.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-robot-dashboard/default.nix b/melodic/rqt-robot-dashboard/default.nix index b53067be4d..cb9c247351 100644 --- a/melodic/rqt-robot-dashboard/default.nix +++ b/melodic/rqt-robot-dashboard/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''rqt_robot_dashboard provides an infrastructure for building robot dashboard plugins in rqt.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-robot-monitor/default.nix b/melodic/rqt-robot-monitor/default.nix index c6bcaed5b0..b755e36214 100644 --- a/melodic/rqt-robot-monitor/default.nix +++ b/melodic/rqt-robot-monitor/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rqt-gui-py, rqt-gui, pythonPackages, catkin, rqt-bag, qt-gui, qt-gui-py-common, rospy, diagnostic-msgs, rqt-py-common, python-qt-binding }: +{ lib, buildRosPackage, fetchurl, rqt-gui-py, python-qt-binding, catkin, rqt-gui, pythonPackages, rqt-bag, qt-gui, rospy, diagnostic-msgs, rqt-py-common, qt-gui-py-common }: buildRosPackage { pname = "ros-melodic-rqt-robot-monitor"; version = "0.5.8"; @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "3f1c272f0f73b0c3f1dc3283e233a183f4a0541ee345408fcb6ac83430bb52a8"; }; - propagatedBuildInputs = [ rqt-gui-py python-qt-binding pythonPackages.rospkg rqt-gui rqt-bag qt-gui rospy diagnostic-msgs rqt-py-common qt-gui-py-common ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-gui rqt-bag qt-gui qt-gui-py-common rospy diagnostic-msgs rqt-py-common python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { @@ -30,6 +30,6 @@ buildRosPackage { You can look at the detail of each status by double-clicking the tree nodes.
    Currently re-usable API to other pkgs are not explicitly provided.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-robot-plugins/default.nix b/melodic/rqt-robot-plugins/default.nix index 7b848ddd12..21cf417689 100644 --- a/melodic/rqt-robot-plugins/default.nix +++ b/melodic/rqt-robot-plugins/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "2fa30a70d1eed9ff4724c1b9d1ef8303066b373bae9abcbf2b8a715a89e515ba"; }; - propagatedBuildInputs = [ rqt-nav-view rqt-rviz rqt-moveit rqt-pose-view rqt-tf-tree rqt-robot-dashboard rqt-robot-monitor rqt-robot-steering rqt-runtime-monitor ]; + propagatedBuildInputs = [ rqt-nav-view rqt-rviz rqt-pose-view rqt-moveit rqt-tf-tree rqt-robot-dashboard rqt-robot-monitor rqt-robot-steering rqt-runtime-monitor ]; nativeBuildInputs = [ catkin ]; meta = { @@ -30,6 +30,6 @@ buildRosPackage { ROS backend tools suite that can be used on/off of robot runtime.
  • rqt_robot_plugins (You're here!)
    • ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-robot-steering/default.nix b/melodic/rqt-robot-steering/default.nix index f2359514a4..6804938cbd 100644 --- a/melodic/rqt-robot-steering/default.nix +++ b/melodic/rqt-robot-steering/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "88c3867ac42fc3ad6533f1fabc58ab169a1f3d4cbe9ae0e165edae28ad5b4df4"; }; - propagatedBuildInputs = [ rqt-gui-py rostopic pythonPackages.rospkg rqt-gui python-qt-binding geometry-msgs ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-gui rostopic python-qt-binding geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_robot_steering provides a GUI plugin for steering a robot using Twist messages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-rosmon/default.nix b/melodic/rqt-rosmon/default.nix index 6b63a7bb65..5197524119 100644 --- a/melodic/rqt-rosmon/default.nix +++ b/melodic/rqt-rosmon/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "f1c00e5e565787c151b3d90332c78084c3baf96052bff2886aa45b6969749dd5"; }; - buildInputs = [ roscpp qt5.qtbase rqt-gui-cpp pluginlib rqt-gui rosmon-msgs ]; - propagatedBuildInputs = [ roscpp rqt-gui-cpp pluginlib rqt-gui rosmon-msgs ]; + buildInputs = [ pluginlib rqt-gui qt5.qtbase rqt-gui-cpp roscpp rosmon-msgs ]; + propagatedBuildInputs = [ pluginlib rqt-gui rqt-gui-cpp roscpp rosmon-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt GUI for rosmon, the node launcher and monitor for ROS. rosmon is a replacement for the roslaunch tool, focused on performance, remote monitoring, and usability.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-rotors/default.nix b/melodic/rqt-rotors/default.nix index d3c56c4eec..fee54cd4f1 100644 --- a/melodic/rqt-rotors/default.nix +++ b/melodic/rqt-rotors/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The rqt_rotors package''; - #license = lib.licenses.ASL 2.0; + license = with lib.licenses; [ "ASL 2.0" ]; }; } diff --git a/melodic/rqt-runtime-monitor/default.nix b/melodic/rqt-runtime-monitor/default.nix index c37aae1943..582a7db604 100644 --- a/melodic/rqt-runtime-monitor/default.nix +++ b/melodic/rqt-runtime-monitor/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "f58958b5649d59fca3022a1771e6a457382744c616835cc65980213ab742fd5c"; }; - propagatedBuildInputs = [ rqt-gui-py qt-gui rospy pythonPackages.rospkg diagnostic-msgs rqt-gui python-qt-binding ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-gui qt-gui rospy diagnostic-msgs python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_runtime_monitor provides a GUI plugin viewing DiagnosticsArray messages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-rviz/default.nix b/melodic/rqt-rviz/default.nix index 795a864bda..96bbfd3923 100644 --- a/melodic/rqt-rviz/default.nix +++ b/melodic/rqt-rviz/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "23e3aa89701e33665c95e1bd0f0df853a52a8bfd433c352071ba9ff597b8ecb7"; }; - buildInputs = [ rviz rqt-gui-cpp pluginlib boost rqt-gui qt5.qtbase ]; - propagatedBuildInputs = [ rviz pluginlib boost rqt-gui-cpp rqt-gui ]; + buildInputs = [ pluginlib boost rqt-gui qt5.qtbase rviz rqt-gui-cpp ]; + propagatedBuildInputs = [ pluginlib boost rqt-gui rviz rqt-gui-cpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_rviz provides a GUI plugin embedding RViz. Note that this rqt plugin does NOT supersede RViz but depends on it.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-service-caller/default.nix b/melodic/rqt-service-caller/default.nix index 0491b46d66..47c386ede2 100644 --- a/melodic/rqt-service-caller/default.nix +++ b/melodic/rqt-service-caller/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "574aa580c11737fc800b058f7cac63a7a7b75d144525d04e89c538716418c1b3"; }; - propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-py-common rqt-gui rosservice ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-gui rosservice rqt-py-common ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_service_caller provides a GUI plugin for calling arbitrary services.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-shell/default.nix b/melodic/rqt-shell/default.nix index d510492c1d..02a7e3ff07 100644 --- a/melodic/rqt-shell/default.nix +++ b/melodic/rqt-shell/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rqt-gui-py, python-qt-binding, catkin, pythonPackages, rqt-gui, qt-gui, qt-gui-py-common }: +{ lib, buildRosPackage, fetchurl, rqt-gui-py, catkin, pythonPackages, rqt-gui, qt-gui, qt-gui-py-common, python-qt-binding }: buildRosPackage { pname = "ros-melodic-rqt-shell"; version = "0.4.9"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "522e34ae2cf5e4af2d14805e70767f394ec88043033a1c6e44324ae58a139001"; }; - propagatedBuildInputs = [ rqt-gui-py qt-gui qt-gui-py-common pythonPackages.rospkg rqt-gui python-qt-binding ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-gui qt-gui qt-gui-py-common python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_shell is a Python GUI plugin providing an interactive shell.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-srv/default.nix b/melodic/rqt-srv/default.nix index 673b6dd321..ae6555ddeb 100644 --- a/melodic/rqt-srv/default.nix +++ b/melodic/rqt-srv/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "601cd2f2679ebf45e306a1b9e6ddaca9dcbb2c614c26cdedc87e2e65c1c2571f"; }; - propagatedBuildInputs = [ rqt-msg rqt-gui-py rosmsg rospy rqt-gui ]; + propagatedBuildInputs = [ rqt-gui-py rqt-gui rosmsg rqt-msg rospy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A Python GUI plugin for introspecting available ROS message types. Note that the srvs available through this plugin is the ones that are stored on your machine, not on the ROS core your rqt instance connects to.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-tf-tree/default.nix b/melodic/rqt-tf-tree/default.nix index d928c28792..0dd12596a1 100644 --- a/melodic/rqt-tf-tree/default.nix +++ b/melodic/rqt-tf-tree/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''rqt_tf_tree provides a GUI plugin for visualizing the ROS TF frame tree.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-top/default.nix b/melodic/rqt-top/default.nix index b44a174ea1..f8d77a68aa 100644 --- a/melodic/rqt-top/default.nix +++ b/melodic/rqt-top/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "06a64dcb66e010ec7fa6e474dcd0b50efac71516ecb6a247c38652d309ee7c8a"; }; - propagatedBuildInputs = [ rqt-gui-py pythonPackages.psutil rospy rqt-gui python-qt-binding ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.psutil rqt-gui rospy python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { description = ''RQT plugin for monitoring ROS processes.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-topic/default.nix b/melodic/rqt-topic/default.nix index 72da3c16e5..9c8892e704 100644 --- a/melodic/rqt-topic/default.nix +++ b/melodic/rqt-topic/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "54ab2164334a2a0ef5774a8b684d8275425e807891d98129795292fa2d968b99"; }; - propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rostopic std-msgs rqt-gui python-qt-binding ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg rqt-gui rostopic std-msgs python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_topic provides a GUI plugin for displaying debug information about ROS topics including publishers, subscribers, publishing rate, and ROS Messages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt-web/default.nix b/melodic/rqt-web/default.nix index 19782d90c4..4c8e1e5c18 100644 --- a/melodic/rqt-web/default.nix +++ b/melodic/rqt-web/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "3192e2e64f268d79b93d505bc475aa1f39009e75f645d294934d55c2b0b27303"; }; - propagatedBuildInputs = [ rqt-gui-py qt-gui rospy pythonPackages.rospkg webkit-dependency rqt-gui python-qt-binding ]; + propagatedBuildInputs = [ rqt-gui-py pythonPackages.rospkg webkit-dependency rqt-gui qt-gui rospy python-qt-binding ]; nativeBuildInputs = [ catkin ]; meta = { description = ''rqt_web is a simple web content viewer for rqt. Users can show web content in Qt-based window by specifying its URL.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rqt/default.nix b/melodic/rqt/default.nix index faf93fe38d..8c0921620d 100644 --- a/melodic/rqt/default.nix +++ b/melodic/rqt/default.nix @@ -23,6 +23,6 @@ buildRosPackage {
  • rqt_robot_plugins - Tools for interacting with robots during their runtime.
    • rqt metapackage provides a widget rqt_gui that enables multiple `rqt` widgets to be docked in a single window.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rslidar-driver/default.nix b/melodic/rslidar-driver/default.nix index cf01d9e89e..77b042dd2f 100644 --- a/melodic/rslidar-driver/default.nix +++ b/melodic/rslidar-driver/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rospy, pcl-ros, tf, pcl-conversions, libpcap, message-generation, message-runtime, angles, roslaunch, roslib, catkin, tf2-ros, std-msgs, nodelet, roscpp, pluginlib, pcl, sensor-msgs, diagnostic-updater, rostest, rslidar-msgs, dynamic-reconfigure }: +{ lib, buildRosPackage, fetchurl, rospy, pcl-ros, tf, pcl-conversions, libpcap, message-generation, message-runtime, angles, roslaunch, roslib, catkin, tf2-ros, std-msgs, roscpp, nodelet, pluginlib, pcl, sensor-msgs, diagnostic-updater, rostest, rslidar-msgs, dynamic-reconfigure }: buildRosPackage { pname = "ros-melodic-rslidar-driver"; version = "1.0.2"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "7f1ae8931ebeb64b13cf0b1976fb269a63257de51d8de79c6cebbd716a307661"; }; - buildInputs = [ tf2-ros pcl-ros std-msgs rospy angles roscpp nodelet tf pcl-conversions pluginlib libpcap pcl sensor-msgs diagnostic-updater rostest rslidar-msgs message-generation dynamic-reconfigure roslaunch roslib ]; + buildInputs = [ pcl-ros rospy tf pcl-conversions libpcap message-generation angles roslaunch roslib tf2-ros std-msgs roscpp nodelet pluginlib pcl sensor-msgs diagnostic-updater rostest rslidar-msgs dynamic-reconfigure ]; propagatedBuildInputs = [ pluginlib pcl sensor-msgs roscpp rospy diagnostic-updater roslib rslidar-msgs message-runtime nodelet pcl-ros std-msgs angles dynamic-reconfigure tf pcl-conversions ]; nativeBuildInputs = [ catkin ]; meta = { description = ''segmentation''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rslidar-msgs/default.nix b/melodic/rslidar-msgs/default.nix index a72465a026..34d07bf87a 100644 --- a/melodic/rslidar-msgs/default.nix +++ b/melodic/rslidar-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS message definitions for Rslidar 3D LIDARs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rslidar-pointcloud/default.nix b/melodic/rslidar-pointcloud/default.nix index 7cdd72f43e..3208908c8f 100644 --- a/melodic/rslidar-pointcloud/default.nix +++ b/melodic/rslidar-pointcloud/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, pluginlib, tf, pcl-conversions, rslidar-driver, catkin, sensor-msgs, tf2-ros, rostest, rslidar-msgs, roslib, nodelet, dynamic-reconfigure, angles, roslaunch, roscpp, pcl-ros }: +{ lib, buildRosPackage, fetchurl, pluginlib, pcl-conversions, rslidar-driver, catkin, sensor-msgs, tf2-ros, roscpp, rostest, rslidar-msgs, roslib, nodelet, dynamic-reconfigure, angles, roslaunch, tf, pcl-ros }: buildRosPackage { pname = "ros-melodic-rslidar-pointcloud"; version = "1.0.2"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "a6c848ebbe5c69d8458345fbb9c5fd54012a1a96130c1587ccf0b251de64aa75"; }; - buildInputs = [ roslaunch pluginlib tf rslidar-driver sensor-msgs roscpp tf2-ros rostest rslidar-msgs nodelet pcl-ros angles dynamic-reconfigure roslib pcl-conversions ]; - propagatedBuildInputs = [ pluginlib tf rslidar-driver sensor-msgs roscpp rslidar-msgs nodelet pcl-ros angles dynamic-reconfigure roslib ]; + buildInputs = [ roslaunch pluginlib rslidar-driver sensor-msgs roscpp tf2-ros roslib rostest rslidar-msgs nodelet pcl-ros angles dynamic-reconfigure tf pcl-conversions ]; + propagatedBuildInputs = [ pluginlib rslidar-driver sensor-msgs roscpp roslib rslidar-msgs nodelet pcl-ros angles dynamic-reconfigure tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Point cloud conversions for rslidar 3D LIDARs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rslidar/default.nix b/melodic/rslidar/default.nix index cfb3849f10..03d70382ef 100644 --- a/melodic/rslidar/default.nix +++ b/melodic/rslidar/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Basic ROS support for the Robosense 3D LIDARs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rtabmap-ros/default.nix b/melodic/rtabmap-ros/default.nix index 9d5f57d9fa..aec26d97d7 100644 --- a/melodic/rtabmap-ros/default.nix +++ b/melodic/rtabmap-ros/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "6fe815c03b7ab3c27db125908e1206c537a46da0ff6266bb0263315833c81c6a"; }; - buildInputs = [ std-srvs rtabmap class-loader cv-bridge tf2-ros image-geometry octomap-msgs move-base-msgs nav-msgs pcl-ros std-msgs tf-conversions rospy laser-geometry tf pcl-conversions find-object-2d stereo-msgs roscpp costmap-2d nodelet visualization-msgs geometry-msgs pcl sensor-msgs image-transport message-filters message-generation rviz dynamic-reconfigure eigen-conversions ]; - propagatedBuildInputs = [ std-srvs rtabmap class-loader cv-bridge tf2-ros image-geometry octomap-msgs move-base-msgs nav-msgs pcl-ros std-msgs tf-conversions rospy laser-geometry compressed-image-transport tf pcl-conversions find-object-2d stereo-msgs costmap-2d roscpp nodelet visualization-msgs geometry-msgs image-transport sensor-msgs message-filters rviz message-runtime dynamic-reconfigure compressed-depth-image-transport eigen-conversions ]; + buildInputs = [ class-loader cv-bridge image-geometry pcl-ros tf-conversions rospy tf pcl-conversions find-object-2d geometry-msgs stereo-msgs image-transport message-filters message-generation rviz eigen-conversions std-srvs rtabmap tf2-ros octomap-msgs move-base-msgs nav-msgs std-msgs laser-geometry roscpp nodelet visualization-msgs costmap-2d pcl sensor-msgs dynamic-reconfigure ]; + propagatedBuildInputs = [ class-loader cv-bridge image-geometry pcl-ros tf-conversions rospy tf pcl-conversions find-object-2d geometry-msgs stereo-msgs image-transport message-filters rviz message-runtime compressed-depth-image-transport eigen-conversions std-srvs rtabmap tf2-ros octomap-msgs move-base-msgs nav-msgs std-msgs laser-geometry compressed-image-transport roscpp nodelet visualization-msgs costmap-2d sensor-msgs dynamic-reconfigure ]; nativeBuildInputs = [ genmsg catkin ]; meta = { description = ''RTAB-Map's ros-pkg. RTAB-Map is a RGB-D SLAM approach with real-time constraints.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rviz-imu-plugin/default.nix b/melodic/rviz-imu-plugin/default.nix index bd1bf5ee78..10b9bffd3f 100644 --- a/melodic/rviz-imu-plugin/default.nix +++ b/melodic/rviz-imu-plugin/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''RVIZ plugin for IMU visualization''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rviz-plugin-tutorials/default.nix b/melodic/rviz-plugin-tutorials/default.nix index aa8141ece2..4d998e716f 100644 --- a/melodic/rviz-plugin-tutorials/default.nix +++ b/melodic/rviz-plugin-tutorials/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Tutorials showing how to write plugins for RViz.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rviz-python-tutorial/default.nix b/melodic/rviz-python-tutorial/default.nix index 8f98b08716..c7300c8914 100644 --- a/melodic/rviz-python-tutorial/default.nix +++ b/melodic/rviz-python-tutorial/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Tutorials showing how to call into rviz internals from python scripts.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rviz-visual-tools/default.nix b/melodic/rviz-visual-tools/default.nix index d6897f2994..54fb93037a 100644 --- a/melodic/rviz-visual-tools/default.nix +++ b/melodic/rviz-visual-tools/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Utility functions for displaying and debugging data in Rviz via published markers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/rviz/default.nix b/melodic/rviz/default.nix index 10481738f3..11762c9018 100644 --- a/melodic/rviz/default.nix +++ b/melodic/rviz/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, rosconsole, rospy, tf, geometry-msgs, image-transport, message-filters, urdfdom-headers, roslib, libGL, std-srvs, ogre1_9, rosbag, catkin, nav-msgs, urdf, resource-retriever, std-msgs, libGLU, tinyxml-2, laser-geometry, python-qt-binding, roscpp, visualization-msgs, cmake-modules, pluginlib, libyamlcpp, sensor-msgs, assimp, urdfdom, rostest, qt5, interactive-markers, eigen, media-export, rosunit, map-msgs }: +{ lib, buildRosPackage, fetchurl, rosconsole, rospy, tf, geometry-msgs, image-transport, message-filters, urdfdom-headers, libGL, roslib, std-srvs, ogre1_9, rosbag, catkin, nav-msgs, urdf, resource-retriever, std-msgs, libGLU, tinyxml-2, laser-geometry, python-qt-binding, roscpp, visualization-msgs, cmake-modules, pluginlib, libyamlcpp, sensor-msgs, assimp, urdfdom, rostest, qt5, interactive-markers, eigen, media-export, rosunit, map-msgs }: buildRosPackage { pname = "ros-melodic-rviz"; version = "1.13.3"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "1d30b85b375f6c15a25f690e3ac296f19527fd1740e85fa26ba059d5f8fd0bda"; }; - buildInputs = [ std-srvs rosconsole ogre1_9 rosbag roslib nav-msgs urdf resource-retriever rospy std-msgs libGLU tinyxml-2 laser-geometry tf python-qt-binding roscpp visualization-msgs geometry-msgs cmake-modules pluginlib libyamlcpp image-transport sensor-msgs message-filters qt5.qtbase assimp urdfdom urdfdom-headers interactive-markers eigen libGL map-msgs ]; + buildInputs = [ rosconsole rospy tf geometry-msgs image-transport message-filters qt5.qtbase urdfdom-headers libGL roslib std-srvs ogre1_9 rosbag nav-msgs urdf resource-retriever std-msgs libGLU tinyxml-2 laser-geometry python-qt-binding roscpp visualization-msgs cmake-modules pluginlib libyamlcpp sensor-msgs assimp urdfdom interactive-markers eigen map-msgs ]; checkInputs = [ rostest rosunit ]; - propagatedBuildInputs = [ std-srvs rosconsole ogre1_9 rosbag roslib nav-msgs urdf resource-retriever rospy std-msgs libGLU tinyxml-2 laser-geometry visualization-msgs tf python-qt-binding roscpp geometry-msgs pluginlib libyamlcpp image-transport sensor-msgs message-filters qt5.qtbase assimp interactive-markers media-export libGL map-msgs ]; + propagatedBuildInputs = [ rosconsole rospy tf geometry-msgs image-transport message-filters qt5.qtbase libGL roslib std-srvs ogre1_9 rosbag nav-msgs urdf resource-retriever std-msgs libGLU tinyxml-2 laser-geometry visualization-msgs python-qt-binding roscpp pluginlib libyamlcpp sensor-msgs assimp interactive-markers media-export map-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''3D visualization tool for ROS.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal "CC-BY-SA-3.0" ]; }; } diff --git a/melodic/sainsmart-relay-usb/default.nix b/melodic/sainsmart-relay-usb/default.nix index 1d72e12119..6847680913 100644 --- a/melodic/sainsmart-relay-usb/default.nix +++ b/melodic/sainsmart-relay-usb/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''SainSmart USB relay driver controller''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/sbg-driver/default.nix b/melodic/sbg-driver/default.nix index de52f9d400..ffd46d15e9 100644 --- a/melodic/sbg-driver/default.nix +++ b/melodic/sbg-driver/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "5dcd118009e8bd76fefe8a9abe3467f6ade59058b8ddcc4b386466c8a419be65"; }; - buildInputs = [ std-srvs message-generation std-msgs sensor-msgs roscpp geometry-msgs ]; - propagatedBuildInputs = [ std-srvs message-runtime std-msgs sensor-msgs roscpp geometry-msgs ]; + buildInputs = [ std-srvs sensor-msgs message-generation std-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ std-srvs sensor-msgs message-runtime std-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The SBG ROS Driver package''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/sbpl-lattice-planner/default.nix b/melodic/sbpl-lattice-planner/default.nix index 128de6568e..fd2a703f3a 100644 --- a/melodic/sbpl-lattice-planner/default.nix +++ b/melodic/sbpl-lattice-planner/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The sbpl_lattice_planner is a global planner plugin for move_base and wraps the SBPL search-based planning library.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/sbpl-recovery/default.nix b/melodic/sbpl-recovery/default.nix index 11b68b87f6..975db6156a 100644 --- a/melodic/sbpl-recovery/default.nix +++ b/melodic/sbpl-recovery/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "b9c8d77b01c68be444f7e4c5dfa555f55c23076a8e6b060b755ca6883ed5f1be"; }; - buildInputs = [ sbpl-lattice-planner pose-follower costmap-2d pluginlib base-local-planner nav-core roscpp tf2-ros ]; - propagatedBuildInputs = [ sbpl-lattice-planner pose-follower costmap-2d pluginlib base-local-planner nav-core roscpp tf2-ros ]; + buildInputs = [ costmap-2d pluginlib base-local-planner nav-core tf2-ros sbpl-lattice-planner pose-follower roscpp ]; + propagatedBuildInputs = [ costmap-2d pluginlib base-local-planner nav-core tf2-ros sbpl-lattice-planner pose-follower roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A recovery behavior that uses the sbpl lattice planner and the pose follower to try to plan in full 3D to get the robot out of really tricky situations.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/sbpl/default.nix b/melodic/sbpl/default.nix index baaebc663a..193a436268 100644 --- a/melodic/sbpl/default.nix +++ b/melodic/sbpl/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Search-based planning library (SBPL).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/scheduler-msgs/default.nix b/melodic/scheduler-msgs/default.nix index c53f6d65cc..bebe223de8 100644 --- a/melodic/scheduler-msgs/default.nix +++ b/melodic/scheduler-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages used by the rocon scheduler.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/schunk-description/default.nix b/melodic/schunk-description/default.nix index d740c24c95..ee2bec4936 100644 --- a/melodic/schunk-description/default.nix +++ b/melodic/schunk-description/default.nix @@ -21,6 +21,6 @@ buildRosPackage { etc.) of different schunk components. The files in this package are parsed and used by a variety of other components. Most users will not interact directly with this package.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/self-test/default.nix b/melodic/self-test/default.nix index 3a2b6b93dc..002c1eba56 100644 --- a/melodic/self-test/default.nix +++ b/melodic/self-test/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''self_test''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/sensor-msgs/default.nix b/melodic/sensor-msgs/default.nix index 10fdb5c4ed..6734735347 100644 --- a/melodic/sensor-msgs/default.nix +++ b/melodic/sensor-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package defines messages for commonly used sensors, including cameras and scanning laser rangefinders.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/serial/default.nix b/melodic/serial/default.nix index 2be75aca43..5e896e26da 100644 --- a/melodic/serial/default.nix +++ b/melodic/serial/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Serial is a cross-platform, simple to use library for using serial ports on computers. This library provides a C++, object oriented interface for interacting with RS-232 like devices on Linux and Windows.''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/settlerlib/default.nix b/melodic/settlerlib/default.nix index 8a9abc9a21..350ff7e926 100644 --- a/melodic/settlerlib/default.nix +++ b/melodic/settlerlib/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Defines helper functions and routines that greatly help when trying to create a settler for a specific sensor channel. This package is experimental and unstable. Expect its APIs to change.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/shape-msgs/default.nix b/melodic/shape-msgs/default.nix index 335b85305e..d52b42b1d3 100644 --- a/melodic/shape-msgs/default.nix +++ b/melodic/shape-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains messages for defining shapes, such as simple solid object primitives (cube, sphere, etc), planes, and meshes.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/sick-safetyscanners/default.nix b/melodic/sick-safetyscanners/default.nix index 473c79d095..732f7c11ff 100644 --- a/melodic/sick-safetyscanners/default.nix +++ b/melodic/sick-safetyscanners/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "1704147cac2d6645162141e5474d67d5a3e63e1a52b2ac98e321b922fc5f3bbd"; }; - buildInputs = [ message-generation dynamic-reconfigure std-msgs sensor-msgs roscpp ]; - propagatedBuildInputs = [ message-runtime dynamic-reconfigure std-msgs sensor-msgs roscpp rqt-reconfigure ]; + buildInputs = [ sensor-msgs message-generation dynamic-reconfigure std-msgs roscpp ]; + propagatedBuildInputs = [ sensor-msgs rqt-reconfigure message-runtime dynamic-reconfigure std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Provides an Interface to read the sensor output of a SICK Safety Scanner''; - #license = lib.licenses.ALv2; + license = with lib.licenses; [ "ALv2" ]; }; } diff --git a/melodic/sick-scan/default.nix b/melodic/sick-scan/default.nix index 6f10149221..6544560500 100644 --- a/melodic/sick-scan/default.nix +++ b/melodic/sick-scan/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "d0c506df63940a7cbee85eb4c56ab229459315184e65e6fa3f9f4aa827fe324a"; }; - buildInputs = [ diagnostic-updater message-generation pcl-ros dynamic-reconfigure visualization-msgs pcl-conversions sensor-msgs roscpp ]; - propagatedBuildInputs = [ diagnostic-updater message-runtime visualization-msgs pcl-ros dynamic-reconfigure roscpp pcl-conversions sensor-msgs ]; + buildInputs = [ sensor-msgs roscpp diagnostic-updater pcl-ros message-generation dynamic-reconfigure visualization-msgs pcl-conversions ]; + propagatedBuildInputs = [ sensor-msgs diagnostic-updater pcl-ros message-runtime visualization-msgs dynamic-reconfigure roscpp pcl-conversions ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A ROS driver for the SICK TiM and SICK MRS series of laser scanners. This package is based on the original sick_tim-repository of Martin Günther et al.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/sick-tim/default.nix b/melodic/sick-tim/default.nix index 659eaa1df7..d9efca0457 100644 --- a/melodic/sick-tim/default.nix +++ b/melodic/sick-tim/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "7e331af0eea21b51239fc2ed9b451fe43529d24569f208a3e71591e2f334c3e1"; }; - buildInputs = [ libusb1 diagnostic-updater roslaunch dynamic-reconfigure sensor-msgs roscpp ]; - propagatedBuildInputs = [ libusb1 diagnostic-updater robot-state-publisher dynamic-reconfigure sensor-msgs roscpp libusb xacro ]; + buildInputs = [ sensor-msgs libusb1 diagnostic-updater dynamic-reconfigure roslaunch roscpp ]; + propagatedBuildInputs = [ sensor-msgs libusb1 diagnostic-updater robot-state-publisher dynamic-reconfigure roscpp libusb xacro ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A ROS driver for the SICK TiM and the SICK MRS 1000 laser scanners.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/simple-grasping/default.nix b/melodic/simple-grasping/default.nix index 5fca65ccf3..649e580887 100644 --- a/melodic/simple-grasping/default.nix +++ b/melodic/simple-grasping/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ shape-msgs cmake-modules sensor-msgs roscpp message-generation actionlib vtkWithQt4 moveit-msgs tf pcl-ros grasping-msgs geometry-msgs ]; - propagatedBuildInputs = [ shape-msgs moveit-python sensor-msgs roscpp vtkWithQt4 message-runtime actionlib moveit-msgs tf pcl-ros grasping-msgs geometry-msgs ]; + propagatedBuildInputs = [ shape-msgs moveit-python sensor-msgs roscpp actionlib message-runtime vtkWithQt4 moveit-msgs tf pcl-ros grasping-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Basic grasping applications and demos.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/simple-message/default.nix b/melodic/simple-message/default.nix index 8ae256b049..aa6d8f27d8 100644 --- a/melodic/simple-message/default.nix +++ b/melodic/simple-message/default.nix @@ -22,6 +22,6 @@ buildRosPackage { with an industrial robot controller. Additional handler and manager classes are included for handling connection limited systems. This package is part of the ROS-Industrial program.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/simulators/default.nix b/melodic/simulators/default.nix index a6271d23ae..c93059864f 100644 --- a/melodic/simulators/default.nix +++ b/melodic/simulators/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "5a6ddc7bfbe78170db5541bdab3f2ab031abcd787b4d087e41d010acb6de2455"; }; - propagatedBuildInputs = [ stage-ros gazebo-ros-pkgs rqt-common-plugins robot rqt-robot-plugins ]; + propagatedBuildInputs = [ gazebo-ros-pkgs robot rqt-robot-plugins stage-ros rqt-common-plugins ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A metapackage to aggregate several packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/single-joint-position-action/default.nix b/melodic/single-joint-position-action/default.nix index 7af419c81c..29a3df7281 100644 --- a/melodic/single-joint-position-action/default.nix +++ b/melodic/single-joint-position-action/default.nix @@ -21,6 +21,6 @@ buildRosPackage { interface for commanding a trajectory to move a joint to a particular position. The action reports success when the joint reaches the desired position.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/slam-karto/default.nix b/melodic/slam-karto/default.nix index d5d3292add..e59b5cb701 100644 --- a/melodic/slam-karto/default.nix +++ b/melodic/slam-karto/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "5a602df47e9778bf47a4e51c2e263c27188f949686e525bb8a446c2eb6637eea"; }; - buildInputs = [ rosconsole cmake-modules sensor-msgs message-filters roscpp nav-msgs visualization-msgs eigen sparse-bundle-adjustment tf open-karto ]; + buildInputs = [ cmake-modules rosconsole sensor-msgs message-filters roscpp nav-msgs visualization-msgs eigen sparse-bundle-adjustment tf open-karto ]; propagatedBuildInputs = [ rosconsole sensor-msgs message-filters roscpp nav-msgs visualization-msgs eigen sparse-bundle-adjustment tf open-karto ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package pulls in the Karto mapping library, and provides a ROS wrapper for using it.''; - #license = lib.licenses.LGPL; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/slic/default.nix b/melodic/slic/default.nix index ff3e10ff3b..c2affe3119 100644 --- a/melodic/slic/default.nix +++ b/melodic/slic/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "70cc442ffa095dd5da8b61cd98ac71d2399f5c66e2becb9509a8860c6b3f55cd"; }; - buildInputs = [ cacert cmake-modules openssl git opencv3 ]; + buildInputs = [ cmake-modules git cacert openssl opencv3 ]; propagatedBuildInputs = [ opencv3 ]; nativeBuildInputs = [ cmake ]; @@ -24,6 +24,6 @@ buildRosPackage { This implementation is created for the specific purpose of creating over-segmentations in an OpenCV-based environment.''; - #license = lib.licenses.N/A; + license = with lib.licenses; [ "N/A" ]; }; } diff --git a/melodic/slime-ros/default.nix b/melodic/slime-ros/default.nix index f8adb118be..5cc91ee929 100644 --- a/melodic/slime-ros/default.nix +++ b/melodic/slime-ros/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Extensions for slime to assist in working with ROS packages''; - #license = lib.licenses.Public Domain; + license = with lib.licenses; [ publicDomain ]; }; } diff --git a/melodic/slime-wrapper/default.nix b/melodic/slime-wrapper/default.nix index 5cef8fc5ca..5f536f2b08 100644 --- a/melodic/slime-wrapper/default.nix +++ b/melodic/slime-wrapper/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''ROS wrapper for slime''; - #license = lib.licenses.Public domain; + license = with lib.licenses; [ publicDomain ]; }; } diff --git a/melodic/smach-msgs/default.nix b/melodic/smach-msgs/default.nix index 66c028da61..836c4f5131 100644 --- a/melodic/smach-msgs/default.nix +++ b/melodic/smach-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''this package contains a set of messages that are used by the introspection interfaces for smach.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/smach-ros/default.nix b/melodic/smach-ros/default.nix index 083783d7da..51ae88ed27 100644 --- a/melodic/smach-ros/default.nix +++ b/melodic/smach-ros/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, std-srvs, actionlib-msgs, catkin, rostest, smach-msgs, actionlib, rostopic, rospy, std-msgs, smach }: +{ lib, buildRosPackage, fetchurl, std-srvs, actionlib-msgs, catkin, rostest, smach-msgs, std-msgs, rostopic, actionlib, rospy, smach }: buildRosPackage { pname = "ros-melodic-smach-ros"; version = "2.0.1"; @@ -13,7 +13,7 @@ buildRosPackage { }; buildInputs = [ rostest ]; - propagatedBuildInputs = [ std-srvs smach-msgs rostopic actionlib-msgs actionlib std-msgs smach rospy ]; + propagatedBuildInputs = [ std-srvs actionlib-msgs rospy smach-msgs rostopic actionlib std-msgs smach ]; nativeBuildInputs = [ catkin ]; meta = { @@ -25,6 +25,6 @@ buildRosPackage { new library that takes advantage of very old concepts in order to quickly create robust robot behavior with maintainable and modular code.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/smach-viewer/default.nix b/melodic/smach-viewer/default.nix index a78a28de4e..7fcf2cabf0 100644 --- a/melodic/smach-viewer/default.nix +++ b/melodic/smach-viewer/default.nix @@ -24,6 +24,6 @@ buildRosPackage { smach viewer uses the SMACH debugging interface based on the smach messages to gather information from running state machines.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/smach/default.nix b/melodic/smach/default.nix index c45bff73ed..ced6cb96ca 100644 --- a/melodic/smach/default.nix +++ b/melodic/smach/default.nix @@ -20,6 +20,6 @@ buildRosPackage { hierarchical state machines. SMACH is a new library that takes advantage of very old concepts in order to quickly create robust robot behavior with maintainable and modular code.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/smclib/default.nix b/melodic/smclib/default.nix index 7a120d4894..99cbce62ce 100644 --- a/melodic/smclib/default.nix +++ b/melodic/smclib/default.nix @@ -21,6 +21,6 @@ buildRosPackage { This package contains the libraries that a compiled state machine depends on, but it does not contain the compiler itself.''; - #license = lib.licenses.Mozilla Public License Version 1.1; + license = with lib.licenses; [ mpl11 ]; }; } diff --git a/melodic/social-navigation-layers/default.nix b/melodic/social-navigation-layers/default.nix index 17e05826d9..6e617323dc 100644 --- a/melodic/social-navigation-layers/default.nix +++ b/melodic/social-navigation-layers/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "106139809be8e491881b20b8510ca74eb2b73109bef94c30f1c58be452e2e4cd"; }; - buildInputs = [ costmap-2d pluginlib angles people-msgs dynamic-reconfigure roscpp geometry-msgs ]; + buildInputs = [ costmap-2d pluginlib people-msgs angles dynamic-reconfigure roscpp geometry-msgs ]; checkInputs = [ roslint ]; - propagatedBuildInputs = [ costmap-2d pluginlib angles people-msgs dynamic-reconfigure roscpp geometry-msgs ]; + propagatedBuildInputs = [ costmap-2d pluginlib people-msgs angles dynamic-reconfigure roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Plugin-based layers for the navigation stack that implement various social navigation contraints, like proxemic distance.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/socketcan-bridge/default.nix b/melodic/socketcan-bridge/default.nix index 31ff14cce9..d68973f62d 100644 --- a/melodic/socketcan-bridge/default.nix +++ b/melodic/socketcan-bridge/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Conversion nodes for messages from SocketCAN to a ROS Topic and vice versa.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/socketcan-interface/default.nix b/melodic/socketcan-interface/default.nix index d2896b9a19..38167cf37a 100644 --- a/melodic/socketcan-interface/default.nix +++ b/melodic/socketcan-interface/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Generic CAN interface description with helpers for filtering and driver implementation. Further a socketcan implementation based on boost::asio is included.''; - #license = lib.licenses.LGPLv3; + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/soem/default.nix b/melodic/soem/default.nix index ef67ff9288..64238a9424 100644 --- a/melodic/soem/default.nix +++ b/melodic/soem/default.nix @@ -20,6 +20,6 @@ buildRosPackage { embedded systems. (http://developer.berlios.de/projects/soem/) This package contains the original soem c code provided by the Technische Universiteit Eindhoven.''; - #license = lib.licenses.GPL+linking exception; + license = with lib.licenses; [ gpl1 ]; }; } diff --git a/melodic/sophus/default.nix b/melodic/sophus/default.nix index 538f38c276..6def2a2ba2 100644 --- a/melodic/sophus/default.nix +++ b/melodic/sophus/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''C++ implementation of Lie Groups using Eigen.''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/sparse-bundle-adjustment/default.nix b/melodic/sparse-bundle-adjustment/default.nix index 3c7610b0c6..5dfe369ddc 100644 --- a/melodic/sparse-bundle-adjustment/default.nix +++ b/melodic/sparse-bundle-adjustment/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS wrapper for the sparse bundle adjustment (sba) library (needed for slam_karto)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/speech-recognition-msgs/default.nix b/melodic/speech-recognition-msgs/default.nix index a0b66ad2c9..36ef30ecfb 100644 --- a/melodic/speech-recognition-msgs/default.nix +++ b/melodic/speech-recognition-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''speech_recognition_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/srdfdom/default.nix b/melodic/srdfdom/default.nix index 8a0e5897e8..a508142bd1 100644 --- a/melodic/srdfdom/default.nix +++ b/melodic/srdfdom/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "97b4cf0327af9082df3270024ceaa89d6b577bb2cbc09a5b19838557189e96f1"; }; - buildInputs = [ urdfdom-headers console-bridge urdf cmake-modules boost tinyxml urdfdom-py ]; + buildInputs = [ cmake-modules boost tinyxml urdfdom-headers console-bridge urdf urdfdom-py ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ urdfdom-headers console-bridge boost tinyxml urdfdom-py ]; + propagatedBuildInputs = [ boost tinyxml urdfdom-headers console-bridge urdfdom-py ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Parser for Semantic Robot Description Format (SRDF).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/stage-ros/default.nix b/melodic/stage-ros/default.nix index 2d7ed7f730..3ce409bf72 100644 --- a/melodic/stage-ros/default.nix +++ b/melodic/stage-ros/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package provides ROS specific hooks for stage''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/stage/default.nix b/melodic/stage/default.nix index a408a0df65..929845a3b1 100644 --- a/melodic/stage/default.nix +++ b/melodic/stage/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "3c72bba7242ecd98b26f177e4227aef06ec85915f196ee88ec6103be4dfb492d"; }; - buildInputs = [ libjpeg fltk libGLU gtk2 libGL libtool ]; - propagatedBuildInputs = [ libGL libjpeg fltk libGLU gtk2 catkin ]; + buildInputs = [ gtk2 libtool libjpeg libGLU fltk libGL ]; + propagatedBuildInputs = [ gtk2 catkin libjpeg libGLU fltk libGL ]; nativeBuildInputs = [ cmake pkg-config ]; meta = { description = ''Mobile robot simulator http://rtv.github.com/Stage''; - #license = lib.licenses.GPL; + license = with lib.licenses; [ gpl1 ]; }; } diff --git a/melodic/static-tf/default.nix b/melodic/static-tf/default.nix index f02c26029d..f0dbc6001f 100644 --- a/melodic/static-tf/default.nix +++ b/melodic/static-tf/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The static_tf package''; - #license = lib.licenses.TODO; + license = with lib.licenses; [ "TODO" ]; }; } diff --git a/melodic/static-transform-mux/default.nix b/melodic/static-transform-mux/default.nix index 01cfa89ca1..79d3e74bdd 100644 --- a/melodic/static-transform-mux/default.nix +++ b/melodic/static-transform-mux/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A helper node that makes sure everybody knows about all static transforms, even if they are published by multiple publishers.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/std-capabilities/default.nix b/melodic/std-capabilities/default.nix index 86d48cea6b..01e3330e24 100644 --- a/melodic/std-capabilities/default.nix +++ b/melodic/std-capabilities/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''This package contains standard capability interfaces, which describe common robot capabilities in terms of ROS concepts such as topics, services, actions, and parameters.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/std-msgs/default.nix b/melodic/std-msgs/default.nix index f4d9e6992f..f840dcccee 100644 --- a/melodic/std-msgs/default.nix +++ b/melodic/std-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Standard ROS Messages including common message types representing primitive data types and other basic message constructs, such as multiarrays. For common, generic robot-specific message types, please see common_msgs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/std-srvs/default.nix b/melodic/std-srvs/default.nix index d38624b3c7..d6dc3439b1 100644 --- a/melodic/std-srvs/default.nix +++ b/melodic/std-srvs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Common service definitions.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/stereo-image-proc/default.nix b/melodic/stereo-image-proc/default.nix index 3ddab775a9..a4c7707355 100644 --- a/melodic/stereo-image-proc/default.nix +++ b/melodic/stereo-image-proc/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Stereo and single image rectification and disparity processing.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/stereo-msgs/default.nix b/melodic/stereo-msgs/default.nix index 600709d557..1c54c38136 100644 --- a/melodic/stereo-msgs/default.nix +++ b/melodic/stereo-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''stereo_msgs contains messages specific to stereo processing, such as disparity images.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-console-util/default.nix b/melodic/swri-console-util/default.nix index 14d2835ac5..ce6c0bf777 100644 --- a/melodic/swri-console-util/default.nix +++ b/melodic/swri-console-util/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''swri_console_util''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-console/default.nix b/melodic/swri-console/default.nix index 0e399a0777..c1a0a37603 100644 --- a/melodic/swri-console/default.nix +++ b/melodic/swri-console/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "3b316832e42c12ebf733b8f9f299ad56326bdeea281c36e1323dfe6c195a4cfe"; }; - buildInputs = [ rosbag-storage rosgraph-msgs boost roscpp qt5.qtbase ]; - propagatedBuildInputs = [ rosbag-storage rosgraph-msgs boost roscpp qt5.qtbase ]; + buildInputs = [ rosbag-storage boost qt5.qtbase rosgraph-msgs roscpp ]; + propagatedBuildInputs = [ rosbag-storage boost qt5.qtbase rosgraph-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A rosout GUI viewer developed at Southwest Research Insititute as an alternative to rqt_console.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-dbw-interface/default.nix b/melodic/swri-dbw-interface/default.nix index 1c44ab8ca6..76a076ffd7 100644 --- a/melodic/swri-dbw-interface/default.nix +++ b/melodic/swri-dbw-interface/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''This package provides documentation on common interface conventions for drive-by-wire systems.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-geometry-util/default.nix b/melodic/swri-geometry-util/default.nix index 88caf166e1..2229ff7958 100644 --- a/melodic/swri-geometry-util/default.nix +++ b/melodic/swri-geometry-util/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "a09570175b7e2453a78c973b2cdc11f93dacc5e0f2f33c7afa80dff66b05162d"; }; - buildInputs = [ cv-bridge cmake-modules eigen geos tf roscpp ]; + buildInputs = [ cmake-modules cv-bridge roscpp eigen geos tf ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ cv-bridge cmake-modules eigen geos tf roscpp ]; + propagatedBuildInputs = [ cmake-modules cv-bridge roscpp eigen geos tf ]; nativeBuildInputs = [ catkin pkg-config ]; meta = { description = ''swri_geometry_util''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-image-util/default.nix b/melodic/swri-image-util/default.nix index 6137e950bd..302ad8ecb1 100644 --- a/melodic/swri-image-util/default.nix +++ b/melodic/swri-image-util/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''swri_image_util''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-math-util/default.nix b/melodic/swri-math-util/default.nix index b22754384e..cd3bb1b345 100644 --- a/melodic/swri-math-util/default.nix +++ b/melodic/swri-math-util/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''swri_math_util''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-nodelet/default.nix b/melodic/swri-nodelet/default.nix index e1c60fbcd6..97508caea5 100644 --- a/melodic/swri-nodelet/default.nix +++ b/melodic/swri-nodelet/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''This package provides a simple script to write simple launch files that can easily switch between running nodelets together or as standalone nodes.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-opencv-util/default.nix b/melodic/swri-opencv-util/default.nix index eead51a241..86633541cf 100644 --- a/melodic/swri-opencv-util/default.nix +++ b/melodic/swri-opencv-util/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''swri_opencv_util''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-prefix-tools/default.nix b/melodic/swri-prefix-tools/default.nix index f9f4d96f8e..6a3476ea36 100644 --- a/melodic/swri-prefix-tools/default.nix +++ b/melodic/swri-prefix-tools/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Contains scripts that are useful as prefix commands for nodes started by roslaunch.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-roscpp/default.nix b/melodic/swri-roscpp/default.nix index 46a58ec001..e5103da4d7 100644 --- a/melodic/swri-roscpp/default.nix +++ b/melodic/swri-roscpp/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "3bdea82fbf4bc4b3aad6f4b209877e9c34926fc2c7a3a732215a9f3c9a9aeffb"; }; - buildInputs = [ diagnostic-updater std-srvs nav-msgs marti-common-msgs dynamic-reconfigure std-msgs roscpp ]; + buildInputs = [ std-srvs diagnostic-updater nav-msgs marti-common-msgs dynamic-reconfigure std-msgs roscpp ]; checkInputs = [ rostest gtest ]; - propagatedBuildInputs = [ diagnostic-updater std-srvs nav-msgs marti-common-msgs dynamic-reconfigure std-msgs roscpp ]; + propagatedBuildInputs = [ std-srvs diagnostic-updater nav-msgs marti-common-msgs dynamic-reconfigure std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''swri_roscpp''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-rospy/default.nix b/melodic/swri-rospy/default.nix index 29488ee95d..cf2c5d584c 100644 --- a/melodic/swri-rospy/default.nix +++ b/melodic/swri-rospy/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package provides added functionaliy on top of rospy, including a single-threaded callback queue.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-route-util/default.nix b/melodic/swri-route-util/default.nix index 8c0236c89c..4defb195b2 100644 --- a/melodic/swri-route-util/default.nix +++ b/melodic/swri-route-util/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "abb33dfe7604804a00e7a03fc1b8460067b3302851e54df037dfcbe1ab0fbe04"; }; - buildInputs = [ swri-math-util marti-common-msgs visualization-msgs swri-geometry-util marti-nav-msgs roscpp swri-transform-util ]; - propagatedBuildInputs = [ swri-math-util marti-common-msgs visualization-msgs swri-geometry-util marti-nav-msgs roscpp swri-transform-util ]; + buildInputs = [ swri-math-util roscpp marti-nav-msgs marti-common-msgs swri-geometry-util visualization-msgs swri-transform-util ]; + propagatedBuildInputs = [ swri-math-util roscpp marti-nav-msgs marti-common-msgs swri-geometry-util visualization-msgs swri-transform-util ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This library provides functionality to simplify working with the navigation messages defined in marti_nav_msgs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-serial-util/default.nix b/melodic/swri-serial-util/default.nix index ee8a79c915..01587dfaf4 100644 --- a/melodic/swri-serial-util/default.nix +++ b/melodic/swri-serial-util/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''swri_serial_util''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-string-util/default.nix b/melodic/swri-string-util/default.nix index 7118759c97..c5e7e5135f 100644 --- a/melodic/swri-string-util/default.nix +++ b/melodic/swri-string-util/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''swri_string_util''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-system-util/default.nix b/melodic/swri-system-util/default.nix index cc5a798f38..0d76617182 100644 --- a/melodic/swri-system-util/default.nix +++ b/melodic/swri-system-util/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''swri_system_util''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-transform-util/default.nix b/melodic/swri-transform-util/default.nix index 86dba5eb3e..6c0289457f 100644 --- a/melodic/swri-transform-util/default.nix +++ b/melodic/swri-transform-util/default.nix @@ -14,12 +14,12 @@ buildRosPackage { buildInputs = [ swri-math-util boost libyamlcpp swri-nodelet topic-tools cv-bridge roscpp geographic-msgs gps-common proj swri-roscpp swri-yaml-util rospy diagnostic-msgs nodelet geos tf geometry-msgs ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ swri-math-util cv-bridge proj swri-yaml-util rospy diagnostic-msgs geos roscpp nodelet tf geometry-msgs boost libyamlcpp sensor-msgs swri-nodelet geographic-msgs gps-common swri-roscpp topic-tools ]; + propagatedBuildInputs = [ cv-bridge swri-yaml-util rospy diagnostic-msgs geos tf geometry-msgs boost swri-nodelet gps-common swri-math-util proj roscpp nodelet libyamlcpp sensor-msgs geographic-msgs swri-roscpp topic-tools ]; nativeBuildInputs = [ catkin pkg-config ]; meta = { description = ''The swri_transform_util package contains utility functions and classes for transforming between coordinate frames.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/swri-yaml-util/default.nix b/melodic/swri-yaml-util/default.nix index a4f4612edd..9eef8ede1f 100644 --- a/melodic/swri-yaml-util/default.nix +++ b/melodic/swri-yaml-util/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Provides wrappers around the yaml-cpp library for various utility functions and to abstract out the API changes made to yaml-cpp between ubuntu:precise and ubuntu:trusty.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/talos-description-calibration/default.nix b/melodic/talos-description-calibration/default.nix index 44d61c3554..47e2944aa9 100644 --- a/melodic/talos-description-calibration/default.nix +++ b/melodic/talos-description-calibration/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''This package contains the description of the hand-eye calibration of the TALOS robot. The files in this package are used also from the talos_description package.''; - #license = lib.licenses.Creative Commons BY-NC-ND 3.0; + license = with lib.licenses; [ "CC-BY-NC-ND-4.0" ]; }; } diff --git a/melodic/talos-description-inertial/default.nix b/melodic/talos-description-inertial/default.nix index dbbe8859c1..666e5256c8 100644 --- a/melodic/talos-description-inertial/default.nix +++ b/melodic/talos-description-inertial/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Inertial parameters of talos''; - #license = lib.licenses.Creative Commons BY-NC-ND 3.0; + license = with lib.licenses; [ "CC-BY-NC-ND-4.0" ]; }; } diff --git a/melodic/talos-description/default.nix b/melodic/talos-description/default.nix index 21ac553ec1..a9d10525e8 100644 --- a/melodic/talos-description/default.nix +++ b/melodic/talos-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The talos_description package''; - #license = lib.licenses.Proprietary; + license = with lib.licenses; [ "Proprietary" ]; }; } diff --git a/melodic/teb-local-planner-tutorials/default.nix b/melodic/teb-local-planner-tutorials/default.nix index fef346488d..b67939827a 100644 --- a/melodic/teb-local-planner-tutorials/default.nix +++ b/melodic/teb-local-planner-tutorials/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "0a565d87f210b89666efd8a62608439a79462561b64a5fa731756ec5af290b37"; }; - propagatedBuildInputs = [ stage-ros map-server amcl teb-local-planner move-base ]; + propagatedBuildInputs = [ map-server amcl move-base stage-ros teb-local-planner ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The teb_local_planner_tutorials package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/teb-local-planner/default.nix b/melodic/teb-local-planner/default.nix index 2152c3a8ed..bb22e26e7f 100644 --- a/melodic/teb-local-planner/default.nix +++ b/melodic/teb-local-planner/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "0f6781263817af727d483e50ac7316f162c00dc079234f23acbc796f44959894"; }; - buildInputs = [ tf2-geometry-msgs libg2o tf2-ros nav-msgs dynamic-reconfigure std-msgs visualization-msgs roscpp geometry-msgs costmap-2d cmake-modules base-local-planner pluginlib nav-core tf2 message-generation costmap-converter interactive-markers tf2-eigen ]; + buildInputs = [ libg2o dynamic-reconfigure geometry-msgs message-generation tf2-geometry-msgs tf2-ros nav-msgs std-msgs visualization-msgs roscpp costmap-2d cmake-modules base-local-planner pluginlib nav-core tf2 costmap-converter interactive-markers tf2-eigen ]; propagatedBuildInputs = [ costmap-2d pluginlib base-local-planner libg2o nav-core tf2-ros tf2 nav-msgs interactive-markers costmap-converter dynamic-reconfigure std-msgs visualization-msgs message-runtime roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; @@ -22,6 +22,6 @@ buildRosPackage { The underlying method called Timed Elastic Band locally optimizes the robot's trajectory with respect to trajectory execution time, separation from obstacles and compliance with kinodynamic constraints at runtime.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/teleop-tools-msgs/default.nix b/melodic/teleop-tools-msgs/default.nix index 9bba30bf74..f93c412b63 100644 --- a/melodic/teleop-tools-msgs/default.nix +++ b/melodic/teleop-tools-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The teleop_tools_msgs package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/teleop-tools/default.nix b/melodic/teleop-tools/default.nix index ff9d1d595d..1247c42ebd 100644 --- a/melodic/teleop-tools/default.nix +++ b/melodic/teleop-tools/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A set of generic teleoperation tools for any robot.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/teleop-twist-joy/default.nix b/melodic/teleop-twist-joy/default.nix index 0d77db6c7a..dba0b15f1a 100644 --- a/melodic/teleop-twist-joy/default.nix +++ b/melodic/teleop-twist-joy/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "3e9186dd642c84cc2776994b6afa7a97a9a4759d53170c1e1f9fddd9fbc789e4"; }; - buildInputs = [ roslaunch rostest roslint geometry-msgs sensor-msgs joy roscpp ]; + buildInputs = [ roslint sensor-msgs joy rostest roslaunch roscpp geometry-msgs ]; propagatedBuildInputs = [ roscpp sensor-msgs joy geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Generic joystick teleop for twist robots.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/teleop-twist-keyboard/default.nix b/melodic/teleop-twist-keyboard/default.nix index f92c9d5299..259a0ecd4d 100644 --- a/melodic/teleop-twist-keyboard/default.nix +++ b/melodic/teleop-twist-keyboard/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Generic keyboard teleop for twist robots.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/teraranger/default.nix b/melodic/teraranger/default.nix new file mode 100644 index 0000000000..b45a5be6c6 --- /dev/null +++ b/melodic/teraranger/default.nix @@ -0,0 +1,23 @@ + +# Copyright 2019 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, sensor-msgs, catkin, serial, dynamic-reconfigure, std-msgs, roscpp }: +buildRosPackage { + pname = "ros-melodic-teraranger"; + version = "2.1.0-r1"; + + src = fetchurl { + url = https://github.com/Terabee/teraranger-release/archive/release/melodic/teraranger/2.1.0-1.tar.gz; + sha256 = "7a46f25a882f135c1261b889e11462660d26f4b6e6d288d8b2026dfda5f4bc0a"; + }; + + buildInputs = [ sensor-msgs serial dynamic-reconfigure std-msgs roscpp ]; + propagatedBuildInputs = [ sensor-msgs serial dynamic-reconfigure std-msgs roscpp ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''This package provides ros nodes for single sensors from Terabee''; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/melodic/test-diagnostic-aggregator/default.nix b/melodic/test-diagnostic-aggregator/default.nix index e6f9431946..f14062f7e9 100644 --- a/melodic/test-diagnostic-aggregator/default.nix +++ b/melodic/test-diagnostic-aggregator/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "4c49680ea5fe2d6e4c792d09848623c3b0206126ad171c4b4dd61f400c9abfe3"; }; - buildInputs = [ rostest pluginlib rospy diagnostic-msgs roscpp diagnostic-aggregator ]; + buildInputs = [ pluginlib rostest rospy diagnostic-msgs roscpp diagnostic-aggregator ]; propagatedBuildInputs = [ pluginlib rospy diagnostic-msgs roscpp diagnostic-aggregator ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Basic diagnostic_aggregator tests are in the''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/test-mavros/default.nix b/melodic/test-mavros/default.nix index 6861b9b731..b69a5abcb7 100644 --- a/melodic/test-mavros/default.nix +++ b/melodic/test-mavros/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, mavros-extras, cmake-modules, control-toolbox, mavros, catkin, tf2-ros, eigen, std-msgs, angles, eigen-conversions, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, mavros-extras, cmake-modules, control-toolbox, mavros, catkin, tf2-ros, angles, std-msgs, eigen-conversions, roscpp, geometry-msgs, eigen }: buildRosPackage { pname = "ros-melodic-test-mavros"; version = "0.29.2"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "de15444e834540abb574c250800527f2d808fe7590139785ea7df46a07b5fe87"; }; - buildInputs = [ mavros-extras cmake-modules control-toolbox mavros tf2-ros angles std-msgs eigen-conversions roscpp geometry-msgs eigen ]; + buildInputs = [ mavros-extras cmake-modules control-toolbox mavros tf2-ros eigen std-msgs angles eigen-conversions roscpp geometry-msgs ]; propagatedBuildInputs = [ mavros-extras control-toolbox mavros tf2-ros eigen std-msgs eigen-conversions roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Tests for MAVROS package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal gpl3 lgpl2 ]; }; } diff --git a/melodic/tf-conversions/default.nix b/melodic/tf-conversions/default.nix index e400b7f9c8..888032c5bc 100644 --- a/melodic/tf-conversions/default.nix +++ b/melodic/tf-conversions/default.nix @@ -13,7 +13,7 @@ buildRosPackage { }; buildInputs = [ kdl-conversions orocos-kdl eigen tf geometry-msgs ]; - propagatedBuildInputs = [ kdl-conversions orocos-kdl eigen python-orocos-kdl tf geometry-msgs ]; + propagatedBuildInputs = [ kdl-conversions orocos-kdl python-orocos-kdl eigen tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { @@ -25,6 +25,6 @@ the datatype of their choice. Currently this package has support for the Kinematics and Dynamics Library (KDL) and the Eigen matrix library. This package is stable, and will get integrated into tf in the next major release cycle (see roadmap).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf-remapper-cpp/default.nix b/melodic/tf-remapper-cpp/default.nix index 936435f9e6..1c887fe442 100644 --- a/melodic/tf-remapper-cpp/default.nix +++ b/melodic/tf-remapper-cpp/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''More efficient version of tf/tf_remap able to handle TFs at kHz with tens of subscribers.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf/default.nix b/melodic/tf/default.nix index be55b5ce6e..ddd68454ac 100644 --- a/melodic/tf/default.nix +++ b/melodic/tf/default.nix @@ -27,6 +27,6 @@ any desired point in time.

    Migration: Since ROS Hydro, tf has been "deprecated" in favor of tf2. tf2 is an iteration on tf providing generally the same feature set more efficiently. As well as adding a few new features.
    As tf2 is a major change the tf API has been maintained in its current form. Since tf2 has a superset of the tf features with a subset of the dependencies the tf implementation has been removed and replaced with calls to tf2 under the hood. This will mean that all users will be compatible with tf2. It is recommended for new work to use tf2 directly as it has a cleaner interface. However tf will continue to be supported for through at least J Turtle.

    ''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf2-bullet/default.nix b/melodic/tf2-bullet/default.nix index b3461f50a1..d2c8ef484d 100644 --- a/melodic/tf2-bullet/default.nix +++ b/melodic/tf2-bullet/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''tf2_bullet''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf2-eigen/default.nix b/melodic/tf2-eigen/default.nix index dabe9f05a8..18f6689095 100644 --- a/melodic/tf2-eigen/default.nix +++ b/melodic/tf2-eigen/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''tf2_eigen''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf2-geometry-msgs/default.nix b/melodic/tf2-geometry-msgs/default.nix index ca50a5d3a6..fd63f542d4 100644 --- a/melodic/tf2-geometry-msgs/default.nix +++ b/melodic/tf2-geometry-msgs/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "f1516df538999a5fb7cb8eeaf71636c9572bba758adac8cdafbf5446918b7bbc"; }; - buildInputs = [ tf2 orocos-kdl tf2-ros python-orocos-kdl geometry-msgs ]; + buildInputs = [ orocos-kdl python-orocos-kdl tf2-ros tf2 geometry-msgs ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ tf2 orocos-kdl tf2-ros python-orocos-kdl geometry-msgs ]; + propagatedBuildInputs = [ orocos-kdl python-orocos-kdl tf2-ros tf2 geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''tf2_geometry_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf2-kdl/default.nix b/melodic/tf2-kdl/default.nix index 89d28ed947..b72d21c122 100644 --- a/melodic/tf2-kdl/default.nix +++ b/melodic/tf2-kdl/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "af0a21267f7ff0d435f5b54a3b55575e399daaf75ed8e01f09906e1b9af018cf"; }; - buildInputs = [ tf2 cmake-modules orocos-kdl eigen tf2-ros ]; + buildInputs = [ cmake-modules orocos-kdl tf2-ros tf2 eigen ]; checkInputs = [ rostest ]; propagatedBuildInputs = [ tf2 orocos-kdl tf2-ros eigen ]; nativeBuildInputs = [ catkin ]; meta = { description = ''KDL binding for tf2''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf2-msgs/default.nix b/melodic/tf2-msgs/default.nix index dc88916a14..a9ddae918f 100644 --- a/melodic/tf2-msgs/default.nix +++ b/melodic/tf2-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''tf2_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf2-py/default.nix b/melodic/tf2-py/default.nix index e33a3d8a3d..f6710039ff 100644 --- a/melodic/tf2-py/default.nix +++ b/melodic/tf2-py/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The tf2_py package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf2-ros/default.nix b/melodic/tf2-ros/default.nix index b853034ca1..e6835745be 100644 --- a/melodic/tf2-ros/default.nix +++ b/melodic/tf2-ros/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS bindings for the tf2 library, for both Python and C++.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf2-sensor-msgs/default.nix b/melodic/tf2-sensor-msgs/default.nix index de80930fb5..34e4e36deb 100644 --- a/melodic/tf2-sensor-msgs/default.nix +++ b/melodic/tf2-sensor-msgs/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "1a5247c2cfec650cb26758f587e6af12e90b0a99749eb861813ab39f83c7b2e6"; }; - buildInputs = [ tf2 cmake-modules eigen sensor-msgs tf2-ros ]; + buildInputs = [ cmake-modules sensor-msgs tf2-ros tf2 eigen ]; checkInputs = [ rostest geometry-msgs ]; - propagatedBuildInputs = [ tf2 rospy python-orocos-kdl sensor-msgs tf2-ros eigen ]; + propagatedBuildInputs = [ python-orocos-kdl sensor-msgs tf2-ros tf2 rospy eigen ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Small lib to transform sensor_msgs with tf. Most notably, PointCloud2''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf2-tools/default.nix b/melodic/tf2-tools/default.nix index 0647a76002..70d2e74217 100644 --- a/melodic/tf2-tools/default.nix +++ b/melodic/tf2-tools/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''tf2_tools''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf2-web-republisher/default.nix b/melodic/tf2-web-republisher/default.nix index 3d87732176..91739139d0 100644 --- a/melodic/tf2-web-republisher/default.nix +++ b/melodic/tf2-web-republisher/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, actionlib-msgs, tf, catkin, tf2-ros, rostest, message-generation, message-runtime, actionlib, rospy, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, actionlib-msgs, catkin, tf2-ros, roscpp, rostest, message-generation, message-runtime, actionlib, rospy, tf, geometry-msgs }: buildRosPackage { pname = "ros-melodic-tf2-web-republisher"; version = "0.3.2"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "401fcc79bf11e5071e8304b1053bf8afed6f3e91d3df30c0823c87c82b741420"; }; - buildInputs = [ message-generation tf2-ros actionlib-msgs actionlib geometry-msgs tf roscpp ]; + buildInputs = [ actionlib-msgs tf tf2-ros message-generation actionlib roscpp geometry-msgs ]; checkInputs = [ rostest rospy ]; - propagatedBuildInputs = [ message-runtime actionlib-msgs actionlib tf2-ros geometry-msgs tf roscpp ]; + propagatedBuildInputs = [ actionlib-msgs tf tf2-ros message-runtime actionlib roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Republishing of Selected TFs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tf2/default.nix b/melodic/tf2/default.nix index 260f57798c..c749891a4c 100644 --- a/melodic/tf2/default.nix +++ b/melodic/tf2/default.nix @@ -23,6 +23,6 @@ buildRosPackage { structure buffered in time, and lets the user transform points, vectors, etc between any two coordinate frames at any desired point in time.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/theora-image-transport/default.nix b/melodic/theora-image-transport/default.nix index 409e06bbc5..869b04a1b2 100644 --- a/melodic/theora-image-transport/default.nix +++ b/melodic/theora-image-transport/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Theora_image_transport provides a plugin to image_transport for transparently sending an image stream encoded with the Theora codec.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tile-map/default.nix b/melodic/tile-map/default.nix index 759965eec4..d055329c20 100644 --- a/melodic/tile-map/default.nix +++ b/melodic/tile-map/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Tile map provides a slippy map style interface for visualizing OpenStreetMap and GooleMap tiles. A mapviz visualization plug-in is also implemented''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/timestamp-tools/default.nix b/melodic/timestamp-tools/default.nix index bbce1564fb..8c1bc850e7 100644 --- a/melodic/timestamp-tools/default.nix +++ b/melodic/timestamp-tools/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package is currently for internal use only. Its API may change without warning in the future. This package is deprecated.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/topic-tools/default.nix b/melodic/topic-tools/default.nix index 79f9aa7ebb..9d56ac8d5f 100644 --- a/melodic/topic-tools/default.nix +++ b/melodic/topic-tools/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "11737ac9aee93efcde7615891fd0342a8151e09b03435b1a173ddedef6c91f18"; }; - buildInputs = [ rosconsole cpp-common roscpp rostest message-generation xmlrpcpp std-msgs rostime rosunit ]; - propagatedBuildInputs = [ rosconsole xmlrpcpp message-runtime std-msgs rostime roscpp ]; + buildInputs = [ cpp-common rosconsole roscpp rostest message-generation xmlrpcpp std-msgs rostime rosunit ]; + propagatedBuildInputs = [ rosconsole roscpp message-runtime xmlrpcpp std-msgs rostime ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { know about the topics whose streams they are altering; instead, these tools deal with messages as generic binary blobs. This means they can be applied to any ROS topic.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/towr-ros/default.nix b/melodic/towr-ros/default.nix index eb9b23be1c..62b64b841a 100644 --- a/melodic/towr-ros/default.nix +++ b/melodic/towr-ros/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, xpp-states, xpp-msgs, xpp-hyq, rosbag, catkin, rqt-bag, xterm, roscpp, message-generation, rviz, ncurses, visualization-msgs, message-runtime, std-msgs, towr }: +{ lib, buildRosPackage, fetchurl, xpp-states, xpp-msgs, xpp-hyq, rosbag, catkin, rqt-bag, xterm, towr, message-generation, rviz, ncurses, message-runtime, visualization-msgs, std-msgs, roscpp }: buildRosPackage { pname = "ros-melodic-towr-ros"; version = "1.4.1"; @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "fd30887f7c1a5dcd841ed043da22a724bc30cc47f3db12593a0da5d7a99ae854"; }; - buildInputs = [ xpp-states xpp-msgs rosbag roscpp message-generation ncurses visualization-msgs message-runtime std-msgs towr ]; - propagatedBuildInputs = [ xpp-states xpp-msgs xpp-hyq rosbag roscpp xterm rqt-bag message-generation rviz ncurses visualization-msgs message-runtime std-msgs towr ]; + buildInputs = [ xpp-states xpp-msgs rosbag towr message-generation ncurses visualization-msgs message-runtime std-msgs roscpp ]; + propagatedBuildInputs = [ xpp-states xpp-msgs xpp-hyq rosbag xterm rqt-bag towr message-generation rviz ncurses visualization-msgs message-runtime std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { Adds a keyboard user interface to set different goal states, motions and robots and visualizes the produced motions plan in rviz using xpp.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/towr/default.nix b/melodic/towr/default.nix index 5ac00cdafb..d82b58805e 100644 --- a/melodic/towr/default.nix +++ b/melodic/towr/default.nix @@ -24,6 +24,6 @@ buildRosPackage { The resulting Nonlinear Programming Problem (NLP) can then be solved with off-the-shelf solvers, e.g. Ipopt using the generic optimizer interface ifopt.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/trac-ik-examples/default.nix b/melodic/trac-ik-examples/default.nix index 2df40440a5..83caec10ee 100644 --- a/melodic/trac-ik-examples/default.nix +++ b/melodic/trac-ik-examples/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the source code for testing and comparing trac_ik''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/trac-ik-kinematics-plugin/default.nix b/melodic/trac-ik-kinematics-plugin/default.nix index 1d2d7b3864..96d9f0e566 100644 --- a/melodic/trac-ik-kinematics-plugin/default.nix +++ b/melodic/trac-ik-kinematics-plugin/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "9ac973d39470f1f0648e6e01cdd11b7207d61f3482bf7a4c302e43b7ae53896f"; }; - buildInputs = [ trac-ik-lib moveit-core pluginlib tf-conversions roscpp ]; - propagatedBuildInputs = [ trac-ik-lib moveit-core pluginlib tf-conversions roscpp ]; + buildInputs = [ pluginlib trac-ik-lib moveit-core tf-conversions roscpp ]; + propagatedBuildInputs = [ pluginlib trac-ik-lib moveit-core tf-conversions roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A MoveIt! Kinematics plugin using TRAC-IK''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/trac-ik-python/default.nix b/melodic/trac-ik-python/default.nix index c0ed871fde..f5003d88ff 100644 --- a/melodic/trac-ik-python/default.nix +++ b/melodic/trac-ik-python/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The trac_ik_python package contains a python wrapper using SWIG for trac_ik_lib''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/trac-ik/default.nix b/melodic/trac-ik/default.nix index 83d1fbf9ab..83f0b6c440 100644 --- a/melodic/trac-ik/default.nix +++ b/melodic/trac-ik/default.nix @@ -20,6 +20,6 @@ buildRosPackage { alternative Inverse Kinematics solver to the popular inverse Jacobian methods in KDL. TRAC-IK handles joint-limited chains better than KDL without increasing solve time.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tracetools/default.nix b/melodic/tracetools/default.nix index 8c27131c14..dc26de04c7 100644 --- a/melodic/tracetools/default.nix +++ b/melodic/tracetools/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Wrapper interface for tracing libraries''; - #license = lib.licenses.APLv2; + license = with lib.licenses; [ "APLv2" ]; }; } diff --git a/melodic/trajectory-msgs/default.nix b/melodic/trajectory-msgs/default.nix index d3c0ec77e9..174d87cb4e 100644 --- a/melodic/trajectory-msgs/default.nix +++ b/melodic/trajectory-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''This package defines messages for defining robot trajectories. These messages are also the building blocks of most of the control_msgs actions.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/trajectory-tracker-msgs/default.nix b/melodic/trajectory-tracker-msgs/default.nix index d4929b907c..0e75720112 100644 --- a/melodic/trajectory-tracker-msgs/default.nix +++ b/melodic/trajectory-tracker-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Message definitions for trajectory_tracker package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/trajectory-tracker-rviz-plugins/default.nix b/melodic/trajectory-tracker-rviz-plugins/default.nix index 241aaa2845..af1360c165 100644 --- a/melodic/trajectory-tracker-rviz-plugins/default.nix +++ b/melodic/trajectory-tracker-rviz-plugins/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Rviz plugins for trajectory_tracker_msgs''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal "CC-BY-SA-3.0" ]; }; } diff --git a/melodic/transmission-interface/default.nix b/melodic/transmission-interface/default.nix index 5d67748f85..550636d03a 100644 --- a/melodic/transmission-interface/default.nix +++ b/melodic/transmission-interface/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "6b28074919478b6422588385850f0450d788ad06829adca29ae5cf2cac798692"; }; - buildInputs = [ hardware-interface cmake-modules pluginlib roscpp tinyxml ]; + buildInputs = [ hardware-interface cmake-modules pluginlib tinyxml roscpp ]; checkInputs = [ rosunit resource-retriever ]; propagatedBuildInputs = [ tinyxml roscpp pluginlib ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Transmission Interface.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tts/default.nix b/melodic/tts/default.nix index a2cf119d80..95fbd02599 100644 --- a/melodic/tts/default.nix +++ b/melodic/tts/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "1d5dd8813c3e0cf4e9e75bd364a93f1b0b02072ddd561fa0d316a75cd0a9d708"; }; - buildInputs = [ rostest pythonPackages.boto3 message-generation actionlib-msgs rospy std-msgs rosunit sound-play ]; + buildInputs = [ actionlib-msgs sound-play rostest pythonPackages.boto3 message-generation rospy std-msgs rosunit ]; checkInputs = [ rostest pythonPackages.mock rosunit ]; - propagatedBuildInputs = [ pythonPackages.boto3 message-runtime actionlib-msgs rospy std-msgs sound-play ]; + propagatedBuildInputs = [ actionlib-msgs sound-play pythonPackages.boto3 message-runtime rospy std-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Package enabling a robot to speak with a human voice by providing a Text-To-Speech ROS service''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtle-actionlib/default.nix b/melodic/turtle-actionlib/default.nix index 8773cbc195..81c53d4b21 100644 --- a/melodic/turtle-actionlib/default.nix +++ b/melodic/turtle-actionlib/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''turtle_actionlib demonstrates how to write an action server and client with the turtlesim. The shape_server provides and action interface for drawing regular polygons with the turtlesim.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/turtle-tf/default.nix b/melodic/turtle-tf/default.nix index 4ea0dcd7d3..5cdad967e8 100644 --- a/melodic/turtle-tf/default.nix +++ b/melodic/turtle-tf/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "182947fcfff5ec44a27e343306a78fd488fbcaff6d8ca894ed0646846293f02d"; }; - buildInputs = [ turtlesim rospy std-msgs tf roscpp geometry-msgs ]; - propagatedBuildInputs = [ turtlesim rospy std-msgs tf roscpp geometry-msgs ]; + buildInputs = [ turtlesim roscpp rospy std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ turtlesim roscpp rospy std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''turtle_tf demonstrates how to write a tf broadcaster and listener with the turtlesim. The tutle_tf_listener commands turtle2 to follow turtle1 around as you drive turtle1 using the keyboard.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/turtle-tf2/default.nix b/melodic/turtle-tf2/default.nix index 4e90e05989..baf182997b 100644 --- a/melodic/turtle-tf2/default.nix +++ b/melodic/turtle-tf2/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "898be65b26bacc4c8ec117c9696b0506f18c33cce83c507442c3b4b239c64ada"; }; - buildInputs = [ turtlesim tf2 tf2-ros rospy std-msgs roscpp geometry-msgs ]; - propagatedBuildInputs = [ turtlesim tf2 tf2-ros rospy std-msgs roscpp geometry-msgs ]; + buildInputs = [ turtlesim tf2-ros tf2 rospy std-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ turtlesim tf2-ros tf2 rospy std-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''turtle_tf2 demonstrates how to write a tf2 broadcaster and listener with the turtlesim. The tutle_tf2_listener commands turtle2 to follow turtle1 around as you drive turtle1 using the keyboard.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/turtlebot3-applications-msgs/default.nix b/melodic/turtlebot3-applications-msgs/default.nix index 31d708b8ef..ed419a3e77 100644 --- a/melodic/turtlebot3-applications-msgs/default.nix +++ b/melodic/turtlebot3-applications-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message and service types: custom messages and services for TurtleBot3 Applications packages''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-applications/default.nix b/melodic/turtlebot3-applications/default.nix index 49577336d3..4de203b3e5 100644 --- a/melodic/turtlebot3-applications/default.nix +++ b/melodic/turtlebot3-applications/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "6a187830b2a3b3dc070e2ad870e5e17a471fa63318a305b188b13e35b9c5bd69"; }; - propagatedBuildInputs = [ turtlebot3-automatic-parking turtlebot3-automatic-parking-vision turtlebot3-follower turtlebot3-panorama turtlebot3-follow-filter ]; + propagatedBuildInputs = [ turtlebot3-automatic-parking-vision turtlebot3-panorama turtlebot3-follow-filter turtlebot3-automatic-parking turtlebot3-follower ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS packages for the turtlebot3 applications (meta package)''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 bsdOriginal ]; }; } diff --git a/melodic/turtlebot3-automatic-parking-vision/default.nix b/melodic/turtlebot3-automatic-parking-vision/default.nix index 448998dabd..389aa0a81f 100644 --- a/melodic/turtlebot3-automatic-parking-vision/default.nix +++ b/melodic/turtlebot3-automatic-parking-vision/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "6e10d535cf4f41ac732ed8cc54edc197c35c8cf6969c2bf9b0649e37c97809ea"; }; - buildInputs = [ nav-msgs rospy std-msgs sensor-msgs ar-track-alvar-msgs ar-track-alvar geometry-msgs ]; + buildInputs = [ ar-track-alvar sensor-msgs ar-track-alvar-msgs nav-msgs rospy std-msgs geometry-msgs ]; propagatedBuildInputs = [ ar-track-alvar sensor-msgs ar-track-alvar-msgs nav-msgs rviz turtlebot3-bringup robot-state-publisher rospy std-msgs joint-state-publisher geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Package for TurtleBot3 automatic_parking which uses ar code. This example needs a printed ar code and a TurtleBot3.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-automatic-parking/default.nix b/melodic/turtlebot3-automatic-parking/default.nix index dc13b859d2..d557ee117d 100644 --- a/melodic/turtlebot3-automatic-parking/default.nix +++ b/melodic/turtlebot3-automatic-parking/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "5ab127fe3a3ff9c1eb767058c423d2e7625925a482c808ddf35047daaa4852be"; }; - buildInputs = [ nav-msgs rospy std-msgs sensor-msgs geometry-msgs ]; - propagatedBuildInputs = [ nav-msgs rospy std-msgs sensor-msgs geometry-msgs ]; + buildInputs = [ sensor-msgs nav-msgs rospy std-msgs geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs nav-msgs rospy std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Package for turtlebot3 automatic_parking. You need a reflective tape and real robots. You can see parking spot using this pacakge on rviz.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-autorace-camera/default.nix b/melodic/turtlebot3-autorace-camera/default.nix index f4082ae1f4..c3215c6190 100644 --- a/melodic/turtlebot3-autorace-camera/default.nix +++ b/melodic/turtlebot3-autorace-camera/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ dynamic-reconfigure ]; - propagatedBuildInputs = [ pythonPackages.enum34 pythonPackages.numpy rospy dynamic-reconfigure cv-bridge sensor-msgs pythonPackages.opencv3 ]; + propagatedBuildInputs = [ pythonPackages.enum34 pythonPackages.numpy sensor-msgs cv-bridge pythonPackages.opencv3 rospy dynamic-reconfigure ]; nativeBuildInputs = [ catkin ]; meta = { description = ''TurtleBot3 AutoRace ROS package that controls Raspberry Pi Camera, and process the image''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-autorace-control/default.nix b/melodic/turtlebot3-autorace-control/default.nix index 9a94855eaf..254ad4aa90 100644 --- a/melodic/turtlebot3-autorace-control/default.nix +++ b/melodic/turtlebot3-autorace-control/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "b56c3c0c52ea3cffbbca2e86a6236f6a8a0520edc2c8178682c1e0dda35dfd94"; }; - propagatedBuildInputs = [ pythonPackages.enum34 nav-msgs pythonPackages.numpy rospy std-msgs sensor-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ pythonPackages.numpy pythonPackages.enum34 sensor-msgs nav-msgs rospy std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''TurtleBot3 AutoRace ROS package that controls TurtleBot3 Auto''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-autorace-core/default.nix b/melodic/turtlebot3-autorace-core/default.nix index 9262c8b910..4ea2b08652 100644 --- a/melodic/turtlebot3-autorace-core/default.nix +++ b/melodic/turtlebot3-autorace-core/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''TurtleBot3 AutoRace ROS package that TurtleBot3 Auto's core''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-autorace-detect/default.nix b/melodic/turtlebot3-autorace-detect/default.nix index 5c695fc6f7..85a7110235 100644 --- a/melodic/turtlebot3-autorace-detect/default.nix +++ b/melodic/turtlebot3-autorace-detect/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ dynamic-reconfigure ]; - propagatedBuildInputs = [ pythonPackages.enum34 pythonPackages.numpy sensor-msgs cv-bridge rospy pythonPackages.opencv3 move-base-msgs nav-msgs dynamic-reconfigure std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ pythonPackages.enum34 pythonPackages.numpy sensor-msgs cv-bridge pythonPackages.opencv3 rospy move-base-msgs nav-msgs dynamic-reconfigure std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''AutoRace ROS packages for feature detection with TurtleBot3 Auto''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-autorace/default.nix b/melodic/turtlebot3-autorace/default.nix index b08f594a02..caa37b16ab 100644 --- a/melodic/turtlebot3-autorace/default.nix +++ b/melodic/turtlebot3-autorace/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''AutoRace ROS packages for AutoRace with TurtleBot3 (meta package)''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-bringup/default.nix b/melodic/turtlebot3-bringup/default.nix index 4f7477f526..972f23f31b 100644 --- a/melodic/turtlebot3-bringup/default.nix +++ b/melodic/turtlebot3-bringup/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "afbf800cde94e405ffa9e691b9379042304dd8455e2c3e906cd7ba97ff636f70"; }; - buildInputs = [ std-msgs diagnostic-msgs sensor-msgs roscpp turtlebot3-msgs ]; + buildInputs = [ sensor-msgs turtlebot3-msgs std-msgs diagnostic-msgs roscpp ]; propagatedBuildInputs = [ rosserial-python sensor-msgs turtlebot3-description turtlebot3-msgs robot-state-publisher hls-lfcd-lds-driver std-msgs diagnostic-msgs turtlebot3-teleop roscpp joint-state-publisher ]; nativeBuildInputs = [ catkin ]; meta = { description = ''roslaunch scripts for starting the TurtleBot3''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-description/default.nix b/melodic/turtlebot3-description/default.nix index 6f46c5aa0c..a133485822 100644 --- a/melodic/turtlebot3-description/default.nix +++ b/melodic/turtlebot3-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''3D models of the TurtleBot3 for simulation and visualization''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-example/default.nix b/melodic/turtlebot3-example/default.nix index 666c6f4c03..b81e1b9d27 100644 --- a/melodic/turtlebot3-example/default.nix +++ b/melodic/turtlebot3-example/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "bc0dbd753ed0334630a38db94dbb4cc73ecda965ad2f61843aa40cba93029feb"; }; - buildInputs = [ actionlib-msgs sensor-msgs turtlebot3-msgs rospy message-generation nav-msgs interactive-markers actionlib std-msgs visualization-msgs geometry-msgs ]; - propagatedBuildInputs = [ actionlib-msgs sensor-msgs turtlebot3-msgs nav-msgs std-msgs interactive-markers turtlebot3-bringup actionlib rospy message-runtime visualization-msgs geometry-msgs ]; + buildInputs = [ actionlib-msgs sensor-msgs turtlebot3-msgs rospy nav-msgs message-generation interactive-markers actionlib std-msgs visualization-msgs geometry-msgs ]; + propagatedBuildInputs = [ actionlib-msgs sensor-msgs turtlebot3-msgs nav-msgs actionlib interactive-markers turtlebot3-bringup rospy std-msgs message-runtime visualization-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This package provides four TurtleBot3 basic example include move using interactive marker, move and stop using LDS, move to goal position, move to custom routes. The interactions node is that you can control the TurtleBot3 front and back side or rotate to goal position. The obstacle node is that when the robot meets an obstacle, it stops. The patrol node is that TurtleBot3 move to custom route. There are 3 route(square, triangle, circle) in this package. You can add your route and move the TurtleBot3. The pointop node is that you can insert goal position include distance x-axis, y-axis and angluar z-axis.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-fake/default.nix b/melodic/turtlebot3-fake/default.nix index 1bb7c4d9e6..2edf52c0dc 100644 --- a/melodic/turtlebot3-fake/default.nix +++ b/melodic/turtlebot3-fake/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, tf, sensor-msgs, catkin, turtlebot3-msgs, nav-msgs, robot-state-publisher, std-msgs, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, sensor-msgs, catkin, turtlebot3-msgs, roscpp, nav-msgs, robot-state-publisher, std-msgs, tf, geometry-msgs }: buildRosPackage { pname = "ros-melodic-turtlebot3-fake"; version = "1.2.0"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "5e76727354184cc0f97b0cf61d4c3743301e431c5d46bbd87436fbed8f1e2e95"; }; - buildInputs = [ nav-msgs geometry-msgs std-msgs sensor-msgs tf turtlebot3-msgs roscpp ]; - propagatedBuildInputs = [ nav-msgs robot-state-publisher geometry-msgs std-msgs sensor-msgs tf turtlebot3-msgs roscpp ]; + buildInputs = [ sensor-msgs turtlebot3-msgs roscpp nav-msgs std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs turtlebot3-msgs roscpp nav-msgs robot-state-publisher std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Package for TurtleBot3 fake node. With this package, simple tests can be done without a robot. You can do simple tests using this package on rviz without real robots.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-follow-filter/default.nix b/melodic/turtlebot3-follow-filter/default.nix index cbf6e43666..b5dd60da1a 100644 --- a/melodic/turtlebot3-follow-filter/default.nix +++ b/melodic/turtlebot3-follow-filter/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''turtlebot3_follow_filter package using laser_filters for turtlebot3_follower package''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-follower/default.nix b/melodic/turtlebot3-follower/default.nix index 7ed8e81b55..b3e8b5636a 100644 --- a/melodic/turtlebot3-follower/default.nix +++ b/melodic/turtlebot3-follower/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "f2059a2728165ba5974739c04cabd2e782f3c06bff35299c149836c98bc6a429"; }; - buildInputs = [ nav-msgs rospy std-msgs sensor-msgs geometry-msgs ]; - propagatedBuildInputs = [ nav-msgs rospy std-msgs sensor-msgs geometry-msgs ]; + buildInputs = [ sensor-msgs nav-msgs rospy std-msgs geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs nav-msgs rospy std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The follower demo was implemented using a 360 Laser Distance Sensor LDS-01. The classification algorithm is used based on previous fitting with samples of person and obstacles positions to take actions. It follows someone in front of the robot within a 50 centimeter range and 140 degrees.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-gazebo/default.nix b/melodic/turtlebot3-gazebo/default.nix index 0769a520d3..5b70fa19c1 100644 --- a/melodic/turtlebot3-gazebo/default.nix +++ b/melodic/turtlebot3-gazebo/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, gazebo-ros, tf, sensor-msgs, catkin, gazeboSimulator, nav-msgs, std-msgs, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, gazebo-ros, sensor-msgs, catkin, gazeboSimulator, roscpp, nav-msgs, std-msgs, tf, geometry-msgs }: buildRosPackage { pname = "ros-melodic-turtlebot3-gazebo"; version = "1.2.0"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "9c82b64f9c29a023ddaf9388d987b60a7584a62400a9ca9d4421347ca4750651"; }; - buildInputs = [ gazebo-ros nav-msgs geometry-msgs std-msgs sensor-msgs tf roscpp ]; - propagatedBuildInputs = [ gazebo-ros nav-msgs geometry-msgs std-msgs gazeboSimulator.gazebo sensor-msgs tf roscpp ]; + buildInputs = [ gazebo-ros sensor-msgs roscpp nav-msgs std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ gazebo-ros gazeboSimulator.gazebo sensor-msgs roscpp nav-msgs std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Gazebo simulation package for the TurtleBot3''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-msgs/default.nix b/melodic/turtlebot3-msgs/default.nix index cd43d0639a..a44465d324 100644 --- a/melodic/turtlebot3-msgs/default.nix +++ b/melodic/turtlebot3-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Message and service types: custom messages and services for TurtleBot3 packages''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-navigation/default.nix b/melodic/turtlebot3-navigation/default.nix index c0d68120b8..1560250bd1 100644 --- a/melodic/turtlebot3-navigation/default.nix +++ b/melodic/turtlebot3-navigation/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The turtlebot3_navigation provides roslaunch scripts for starting the navigation.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-panorama/default.nix b/melodic/turtlebot3-panorama/default.nix index 5d6ba53e39..43746f1235 100644 --- a/melodic/turtlebot3-panorama/default.nix +++ b/melodic/turtlebot3-panorama/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This app utilises pano_ros for taking snapshots and stitching them together to create panorama pictures.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/turtlebot3-simulations/default.nix b/melodic/turtlebot3-simulations/default.nix index 43b6ad937e..9c7c5b2f93 100644 --- a/melodic/turtlebot3-simulations/default.nix +++ b/melodic/turtlebot3-simulations/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''ROS packages for the turtlebot3 simulation (meta package)''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-slam/default.nix b/melodic/turtlebot3-slam/default.nix index 0e6aceac5b..5e57384f0e 100644 --- a/melodic/turtlebot3-slam/default.nix +++ b/melodic/turtlebot3-slam/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The turtlebot3_slam package provides roslaunch scripts for starting the SLAM''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/turtlebot3-teleop/default.nix b/melodic/turtlebot3-teleop/default.nix index 98105f7659..09a7f9d47b 100644 --- a/melodic/turtlebot3-teleop/default.nix +++ b/melodic/turtlebot3-teleop/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Provides teleoperation using keyboard for TurtleBot3.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/turtlebot3/default.nix b/melodic/turtlebot3/default.nix index 2029697e19..bd9971faa9 100644 --- a/melodic/turtlebot3/default.nix +++ b/melodic/turtlebot3/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "23abc6a162dc77a97d154c591285f8c235c2afe0c2906185a91ccec0a80a2b1c"; }; - propagatedBuildInputs = [ turtlebot3-slam turtlebot3-bringup turtlebot3-example turtlebot3-teleop turtlebot3-navigation turtlebot3-description ]; + propagatedBuildInputs = [ turtlebot3-navigation turtlebot3-description turtlebot3-slam turtlebot3-bringup turtlebot3-example turtlebot3-teleop ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS packages for the Turtlebot3 (meta package)''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 bsdOriginal ]; }; } diff --git a/melodic/turtlesim/default.nix b/melodic/turtlesim/default.nix index 3911d3f18e..7be8c6575e 100644 --- a/melodic/turtlesim/default.nix +++ b/melodic/turtlesim/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "eb38cc5c4153b4001fdb8a0dbc1ec95952b7f510abb1d9709e13b6e08a301cef"; }; - buildInputs = [ std-srvs rosconsole rostime roscpp qt5.qtbase message-generation roscpp-serialization std-msgs roslib geometry-msgs ]; - propagatedBuildInputs = [ std-srvs rosconsole rostime qt5.qtbase roscpp message-runtime roscpp-serialization std-msgs roslib geometry-msgs ]; + buildInputs = [ std-srvs rosconsole rostime qt5.qtbase roscpp message-generation roscpp-serialization std-msgs roslib geometry-msgs ]; + propagatedBuildInputs = [ std-srvs rosconsole rostime roscpp qt5.qtbase message-runtime roscpp-serialization std-msgs roslib geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''turtlesim is a tool made for teaching ROS and ROS packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-airskin-msgs/default.nix b/melodic/tuw-airskin-msgs/default.nix index e5f7510210..99459b722c 100644 --- a/melodic/tuw-airskin-msgs/default.nix +++ b/melodic/tuw-airskin-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The tuw_airskin_msgs package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-aruco/default.nix b/melodic/tuw-aruco/default.nix index 7c332bb8e8..d32856bc8b 100644 --- a/melodic/tuw-aruco/default.nix +++ b/melodic/tuw-aruco/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This is a wrapper around the marker detection library ArUco.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-checkerboard/default.nix b/melodic/tuw-checkerboard/default.nix index 70878abbf4..0a5cf95585 100644 --- a/melodic/tuw-checkerboard/default.nix +++ b/melodic/tuw-checkerboard/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "e7d76c6bb8a14e31094674fc33504b7cca4335d4d0c2362ceda6811633fc483c"; }; - buildInputs = [ marker-msgs image-view dynamic-reconfigure tf image-transport cv-bridge image-geometry ]; - propagatedBuildInputs = [ marker-msgs image-view dynamic-reconfigure tf image-transport cv-bridge image-geometry ]; + buildInputs = [ marker-msgs image-transport cv-bridge image-geometry image-view dynamic-reconfigure tf ]; + propagatedBuildInputs = [ marker-msgs image-transport cv-bridge image-geometry image-view dynamic-reconfigure tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The tuw_checkerboard package is designed to detect one checkerboard and to estimate the pose of the checkerboard relative to the camera. The detection itself is based on the opencv functions for checkerboards.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-ellipses/default.nix b/melodic/tuw-ellipses/default.nix index 7f85c6dcdb..64433bf2dc 100644 --- a/melodic/tuw-ellipses/default.nix +++ b/melodic/tuw-ellipses/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, marker-msgs, cmake-modules, tf, image-transport, catkin, cv-bridge, image-geometry, nodelet, rospy, dynamic-reconfigure, roscpp, eigen }: +{ lib, buildRosPackage, fetchurl, marker-msgs, cmake-modules, image-transport, cv-bridge, catkin, roscpp, image-geometry, nodelet, rospy, dynamic-reconfigure, tf, eigen }: buildRosPackage { pname = "ros-melodic-tuw-ellipses"; version = "0.1.1-r1"; @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "6f40eb7c0d83f05f8dac8ce03ca8fd2c6a30876e06174e16d80d8909b84d8749"; }; - buildInputs = [ marker-msgs cmake-modules tf image-transport cv-bridge roscpp image-geometry dynamic-reconfigure rospy nodelet eigen ]; - propagatedBuildInputs = [ marker-msgs tf image-transport cv-bridge roscpp image-geometry dynamic-reconfigure rospy nodelet ]; + buildInputs = [ marker-msgs cmake-modules image-transport cv-bridge roscpp image-geometry nodelet dynamic-reconfigure rospy tf eigen ]; + propagatedBuildInputs = [ marker-msgs tf image-transport cv-bridge image-geometry nodelet dynamic-reconfigure rospy roscpp ]; nativeBuildInputs = [ catkin ]; meta = { @@ -21,6 +21,6 @@ buildRosPackage { The package is able to estimate the pose of the circle related to the ellipse the circle diameter as well as the camera parameter are known. A dynamic reconfigure interface allows the user to tune the parameter of the system to ones needs. But be aware that the pose of a projected circle within a image (ellipse) has two solutions and only one is published as TF.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-gazebo-msgs/default.nix b/melodic/tuw-gazebo-msgs/default.nix index 3899c6ee98..c1c6e832f3 100644 --- a/melodic/tuw-gazebo-msgs/default.nix +++ b/melodic/tuw-gazebo-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "126d0a9d1083f1d6e1c05b617f46f4c00e72dbd5a26a4dfa16490465d7dcc181"; }; - buildInputs = [ std-srvs message-generation rospy std-msgs trajectory-msgs sensor-msgs roscpp geometry-msgs ]; - propagatedBuildInputs = [ std-srvs message-runtime rospy std-msgs trajectory-msgs sensor-msgs roscpp geometry-msgs ]; + buildInputs = [ std-srvs trajectory-msgs sensor-msgs message-generation rospy std-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ std-srvs trajectory-msgs sensor-msgs message-runtime rospy std-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Message and service data structures.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-geometry-msgs/default.nix b/melodic/tuw-geometry-msgs/default.nix index 32b5f2bb0a..b76131a9c5 100644 --- a/melodic/tuw-geometry-msgs/default.nix +++ b/melodic/tuw-geometry-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The tuw_geometry_msgs package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-geometry/default.nix b/melodic/tuw-geometry/default.nix index e0f83eb51f..e1633deaa6 100644 --- a/melodic/tuw-geometry/default.nix +++ b/melodic/tuw-geometry/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "96df80626ab8ecd101acb1f972c815be0d105e9e5539e73d691ea3b2ef5d3e84"; }; - buildInputs = [ boost rospy std-msgs cv-bridge roscpp eigen ]; + buildInputs = [ boost cv-bridge rospy std-msgs roscpp eigen ]; checkInputs = [ rosunit ]; propagatedBuildInputs = [ std-msgs roscpp cv-bridge rospy ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The tuw_geometry package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-marker-detection/default.nix b/melodic/tuw-marker-detection/default.nix index dad38b895c..33bd89aea0 100644 --- a/melodic/tuw-marker-detection/default.nix +++ b/melodic/tuw-marker-detection/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The tuw_marker_detection package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-marker-pose-estimation/default.nix b/melodic/tuw-marker-pose-estimation/default.nix index e1f9d040b9..5e5d942b5a 100644 --- a/melodic/tuw-marker-pose-estimation/default.nix +++ b/melodic/tuw-marker-pose-estimation/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, marker-msgs, tf, catkin, cv-bridge, image-geometry, rospy, std-msgs, dynamic-reconfigure, roscpp }: +{ lib, buildRosPackage, fetchurl, marker-msgs, cv-bridge, catkin, roscpp, image-geometry, rospy, std-msgs, dynamic-reconfigure, tf }: buildRosPackage { pname = "ros-melodic-tuw-marker-pose-estimation"; version = "0.1.1-r1"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "58ea5472112e231d213667c8977c5910de7398b71471b12a8a9e55dab48defd2"; }; - buildInputs = [ image-geometry marker-msgs cv-bridge dynamic-reconfigure std-msgs tf roscpp rospy ]; - propagatedBuildInputs = [ image-geometry marker-msgs cv-bridge dynamic-reconfigure std-msgs tf roscpp rospy ]; + buildInputs = [ marker-msgs tf cv-bridge image-geometry rospy std-msgs dynamic-reconfigure roscpp ]; + propagatedBuildInputs = [ marker-msgs tf cv-bridge image-geometry rospy std-msgs dynamic-reconfigure roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''This node does pose estimation for detected fiducials (marker_msgs/FiducialDetection.msg)''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-msgs/default.nix b/melodic/tuw-msgs/default.nix index 9c1bf5988d..05bf8fe2f7 100644 --- a/melodic/tuw-msgs/default.nix +++ b/melodic/tuw-msgs/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, tuw-nav-msgs, tuw-geometry-msgs, tuw-object-msgs, tuw-airskin-msgs, tuw-vehicle-msgs, catkin, tuw-gazebo-msgs, tuw-multi-robot-msgs }: +{ lib, buildRosPackage, fetchurl, tuw-nav-msgs, tuw-geometry-msgs, tuw-airskin-msgs, tuw-vehicle-msgs, tuw-object-msgs, catkin, tuw-gazebo-msgs, tuw-multi-robot-msgs }: buildRosPackage { pname = "ros-melodic-tuw-msgs"; version = "0.0.13"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "d220a642fe9b13209de81e68572102fffe34285934865e2ed9b8ebe9afe9baf4"; }; - propagatedBuildInputs = [ tuw-nav-msgs tuw-object-msgs tuw-airskin-msgs tuw-geometry-msgs tuw-multi-robot-msgs tuw-vehicle-msgs tuw-gazebo-msgs ]; + propagatedBuildInputs = [ tuw-nav-msgs tuw-geometry-msgs tuw-object-msgs tuw-airskin-msgs tuw-vehicle-msgs tuw-gazebo-msgs tuw-multi-robot-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The tuw_msgs meta package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-multi-robot-msgs/default.nix b/melodic/tuw-multi-robot-msgs/default.nix index ad2ad53043..db102c52d2 100644 --- a/melodic/tuw-multi-robot-msgs/default.nix +++ b/melodic/tuw-multi-robot-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The tuw_multi_robot_msgs package contains messages for sending graph, route and sync data over topics.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-nav-msgs/default.nix b/melodic/tuw-nav-msgs/default.nix index b13475fabd..ee29a18ee6 100644 --- a/melodic/tuw-nav-msgs/default.nix +++ b/melodic/tuw-nav-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "6dd62f9b473be78c32bafb0b1f9c9410d2ed6f2b87586ce77f51e84f49132c39"; }; - buildInputs = [ nav-msgs message-generation tuw-geometry-msgs rospy std-msgs geometry-msgs tf roscpp ]; - propagatedBuildInputs = [ nav-msgs tuw-geometry-msgs message-runtime rospy std-msgs geometry-msgs tf roscpp ]; + buildInputs = [ tuw-geometry-msgs roscpp nav-msgs message-generation rospy std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ tuw-geometry-msgs roscpp nav-msgs message-runtime rospy std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The tuw_nav_msgs package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-object-msgs/default.nix b/melodic/tuw-object-msgs/default.nix index 560a5edcef..c53a5b190a 100644 --- a/melodic/tuw-object-msgs/default.nix +++ b/melodic/tuw-object-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The tuw_object_msgs package. This pkg provides a set of messages used to detect, map and track objects of different types.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/tuw-vehicle-msgs/default.nix b/melodic/tuw-vehicle-msgs/default.nix index 2784080ad3..33b5c9f7e3 100644 --- a/melodic/tuw-vehicle-msgs/default.nix +++ b/melodic/tuw-vehicle-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The tuw_vehicle_msgs package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/twist-mux-msgs/default.nix b/melodic/twist-mux-msgs/default.nix index cbfed87663..47c05c8115 100644 --- a/melodic/twist-mux-msgs/default.nix +++ b/melodic/twist-mux-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The twist_mux msgs and actions package''; - #license = lib.licenses.CC BY-NC-SA 4.0; + license = with lib.licenses; [ cc-by-nc-sa-40 ]; }; } diff --git a/melodic/twist-mux/default.nix b/melodic/twist-mux/default.nix index e8e161cfe9..640896dc17 100644 --- a/melodic/twist-mux/default.nix +++ b/melodic/twist-mux/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "aa2888069d0ed77dbab6759a450cef52d03b6f64b09514c006bd2f49384732bd"; }; - buildInputs = [ diagnostic-updater rostest geometry-msgs std-msgs visualization-msgs roscpp ]; + buildInputs = [ roscpp diagnostic-updater rostest std-msgs visualization-msgs geometry-msgs ]; checkInputs = [ rostopic rospy ]; - propagatedBuildInputs = [ diagnostic-updater geometry-msgs std-msgs visualization-msgs twist-mux-msgs roscpp ]; + propagatedBuildInputs = [ twist-mux-msgs roscpp diagnostic-updater std-msgs visualization-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Twist multiplexer, which multiplex several velocity commands (topics) and allows to priorize or disable them (locks).''; - #license = lib.licenses.CC BY-NC-SA 4.0; + license = with lib.licenses; [ cc-by-nc-sa-40 ]; }; } diff --git a/melodic/twist-recovery/default.nix b/melodic/twist-recovery/default.nix index efc4223e0f..fdda10e049 100644 --- a/melodic/twist-recovery/default.nix +++ b/melodic/twist-recovery/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "8c67a2c46844a984e92f59e344590deedd9525f2bfc7b3201c6a1e8999c2d881"; }; - buildInputs = [ costmap-2d pluginlib base-local-planner tf2-geometry-msgs tf2-ros nav-core geometry-msgs ]; - propagatedBuildInputs = [ costmap-2d pluginlib base-local-planner tf2-geometry-msgs tf2-ros nav-core geometry-msgs ]; + buildInputs = [ costmap-2d pluginlib base-local-planner tf2-geometry-msgs nav-core tf2-ros geometry-msgs ]; + propagatedBuildInputs = [ costmap-2d pluginlib base-local-planner tf2-geometry-msgs nav-core tf2-ros geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A recovery behavior that performs a particular used-defined twist.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/um7/default.nix b/melodic/um7/default.nix index 3363815e04..7fc34f826f 100644 --- a/melodic/um7/default.nix +++ b/melodic/um7/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The um7 package provides a C++ implementation of the CH Robotics serial protocol, and a corresponding ROS node for publishing standard ROS orientation topics from a UM7.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/unique-id/default.nix b/melodic/unique-id/default.nix index c8f8fd956b..87746fface 100644 --- a/melodic/unique-id/default.nix +++ b/melodic/unique-id/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ROS Python and C++ interfaces for universally unique identifiers.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/unique-identifier/default.nix b/melodic/unique-identifier/default.nix index 83e3c073f3..01b94c90bf 100644 --- a/melodic/unique-identifier/default.nix +++ b/melodic/unique-identifier/default.nix @@ -20,6 +20,6 @@ buildRosPackage { Not needed for wet packages, use only to resolve dry stack dependencies.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/urdf-geometry-parser/default.nix b/melodic/urdf-geometry-parser/default.nix index b87b7a4419..10c6fdded7 100644 --- a/melodic/urdf-geometry-parser/default.nix +++ b/melodic/urdf-geometry-parser/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Extract geometry value of a vehicle from urdf''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/urdf-parser-plugin/default.nix b/melodic/urdf-parser-plugin/default.nix index 4b0f21a9ad..82f2548f8a 100644 --- a/melodic/urdf-parser-plugin/default.nix +++ b/melodic/urdf-parser-plugin/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains a C++ base class for URDF parsers.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/urdf-sim-tutorial/default.nix b/melodic/urdf-sim-tutorial/default.nix index 468c923b1f..34014ceda8 100644 --- a/melodic/urdf-sim-tutorial/default.nix +++ b/melodic/urdf-sim-tutorial/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The urdf_sim_tutorial package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/urdf-test/default.nix b/melodic/urdf-test/default.nix index d7fae1d653..4bcb042647 100644 --- a/melodic/urdf-test/default.nix +++ b/melodic/urdf-test/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The urdf_test package''; - #license = lib.licenses.Proprietary; + license = with lib.licenses; [ "Proprietary" ]; }; } diff --git a/melodic/urdf-tutorial/default.nix b/melodic/urdf-tutorial/default.nix index b372c4af10..f5fba93969 100644 --- a/melodic/urdf-tutorial/default.nix +++ b/melodic/urdf-tutorial/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains a number of URDF tutorials.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/urdf/default.nix b/melodic/urdf/default.nix index a7cadef651..b8362724e9 100644 --- a/melodic/urdf/default.nix +++ b/melodic/urdf/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, cmake-modules, pluginlib, catkin, rosconsole-bridge, tinyxml, urdfdom, urdf-parser-plugin, rostest, urdfdom-headers, tinyxml-2, roscpp }: +{ lib, buildRosPackage, fetchurl, pluginlib, cmake-modules, catkin, rosconsole-bridge, tinyxml, urdf-parser-plugin, urdfdom, rostest, urdfdom-headers, tinyxml-2, roscpp }: buildRosPackage { pname = "ros-melodic-urdf"; version = "1.13.1"; @@ -12,9 +12,9 @@ buildRosPackage { sha256 = "2d16536bc8a59e01339b034539828f411245a3b170abc65d8e1f99f1305ae4f0"; }; - buildInputs = [ pluginlib cmake-modules tinyxml rosconsole-bridge urdfdom urdf-parser-plugin urdfdom-headers tinyxml-2 roscpp ]; + buildInputs = [ cmake-modules pluginlib rosconsole-bridge tinyxml urdf-parser-plugin urdfdom urdfdom-headers tinyxml-2 roscpp ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ urdfdom-headers tinyxml pluginlib tinyxml-2 roscpp rosconsole-bridge urdfdom ]; + propagatedBuildInputs = [ pluginlib rosconsole-bridge tinyxml urdfdom urdfdom-headers tinyxml-2 roscpp ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { Format (URDF), which is an XML format for representing a robot model. The code API of the parser has been through our review process and will remain backwards compatible in future releases.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/urdfdom-py/default.nix b/melodic/urdfdom-py/default.nix index 5762e9930e..52056f4362 100644 --- a/melodic/urdfdom-py/default.nix +++ b/melodic/urdfdom-py/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Python implementation of the URDF parser.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/urg-c/default.nix b/melodic/urg-c/default.nix index 686f6221aa..3745280a3e 100644 --- a/melodic/urg-c/default.nix +++ b/melodic/urg-c/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''The urg_c package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/urg-node/default.nix b/melodic/urg-node/default.nix index 627ab0e809..eb1ef929f7 100644 --- a/melodic/urg-node/default.nix +++ b/melodic/urg-node/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''urg_node''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/urg-stamped/default.nix b/melodic/urg-stamped/default.nix index 2c8638248a..4ccef9bb6c 100644 --- a/melodic/urg-stamped/default.nix +++ b/melodic/urg-stamped/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Precisely stamped URG driver for ROS''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/usb-cam-controllers/default.nix b/melodic/usb-cam-controllers/default.nix index bbbcc16e97..98c18a3b76 100644 --- a/melodic/usb-cam-controllers/default.nix +++ b/melodic/usb-cam-controllers/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The usb_cam_controllers package''; - #license = lib.licenses.TODO; + license = with lib.licenses; [ "TODO" ]; }; } diff --git a/melodic/usb-cam-hardware-interface/default.nix b/melodic/usb-cam-hardware-interface/default.nix index 737c5f0726..65f93d1a35 100644 --- a/melodic/usb-cam-hardware-interface/default.nix +++ b/melodic/usb-cam-hardware-interface/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The usb_cam_hardware_interface package''; - #license = lib.licenses.TODO; + license = with lib.licenses; [ "TODO" ]; }; } diff --git a/melodic/usb-cam-hardware/default.nix b/melodic/usb-cam-hardware/default.nix index 8f4adbfdd3..89db7d4c15 100644 --- a/melodic/usb-cam-hardware/default.nix +++ b/melodic/usb-cam-hardware/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "29d9274d9b3cf8787c3f80c5354eb605608205118e6ccf56a2aabd26011f7b43"; }; - buildInputs = [ controller-manager hardware-interface pluginlib nodelet usb-cam-hardware-interface roscpp ]; - propagatedBuildInputs = [ controller-manager hardware-interface pluginlib nodelet usb-cam-hardware-interface roscpp ]; + buildInputs = [ controller-manager hardware-interface pluginlib usb-cam-hardware-interface nodelet roscpp ]; + propagatedBuildInputs = [ controller-manager hardware-interface pluginlib usb-cam-hardware-interface nodelet roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The usb_cam_hardware package''; - #license = lib.licenses.TODO; + license = with lib.licenses; [ "TODO" ]; }; } diff --git a/melodic/usb-cam/default.nix b/melodic/usb-cam/default.nix index e918dec903..6a65153f87 100644 --- a/melodic/usb-cam/default.nix +++ b/melodic/usb-cam/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "21a2fa956af929b771c989bdb53a572443481b101cea0ba0b66547e0440a9bd5"; }; - buildInputs = [ std-srvs camera-info-manager std-msgs image-transport sensor-msgs roscpp ffmpeg ]; - propagatedBuildInputs = [ std-srvs camera-info-manager std-msgs image-transport sensor-msgs roscpp v4l_utils ffmpeg ]; + buildInputs = [ std-srvs camera-info-manager image-transport sensor-msgs ffmpeg std-msgs roscpp ]; + propagatedBuildInputs = [ std-srvs camera-info-manager image-transport sensor-msgs ffmpeg std-msgs roscpp v4l_utils ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A ROS Driver for V4L USB Cameras''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/usv-gazebo-plugins/default.nix b/melodic/usv-gazebo-plugins/default.nix index 0e1f3c3c76..7013d82849 100644 --- a/melodic/usv-gazebo-plugins/default.nix +++ b/melodic/usv-gazebo-plugins/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "61bbed37ef07cd02e27f6710063400a17b259523bbe721a0f657120b3a3c11ad"; }; - buildInputs = [ gazebo-ros eigen std-msgs roscpp gazebo-dev ]; - propagatedBuildInputs = [ gazebo-ros message-runtime eigen std-msgs roscpp gazebo-dev ]; + buildInputs = [ gazebo-ros gazebo-dev eigen std-msgs roscpp ]; + propagatedBuildInputs = [ gazebo-ros gazebo-dev message-runtime eigen std-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Gazebo plugins for simulating Unmanned Surface Vehicles Originaly copied from https://github.com/bsb808/usv_gazebo_plugins''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuid-msgs/default.nix b/melodic/uuid-msgs/default.nix index e15b8680fd..294f05e089 100644 --- a/melodic/uuid-msgs/default.nix +++ b/melodic/uuid-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS messages for universally unique identifiers.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/uuv-assistants/default.nix b/melodic/uuv-assistants/default.nix index 420b205e75..febf692a46 100644 --- a/melodic/uuv-assistants/default.nix +++ b/melodic/uuv-assistants/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, geometry-msgs, sensor-msgs, catkin, pythonPackages, roscpp, nav-msgs, rosgraph, rostopic, visualization-msgs, rospy, topic-tools, tf, gazebo-msgs }: +{ lib, buildRosPackage, fetchurl, geometry-msgs, tf, sensor-msgs, catkin, pythonPackages, nav-msgs, rosgraph, rostopic, visualization-msgs, rospy, topic-tools, roscpp, gazebo-msgs }: buildRosPackage { pname = "ros-melodic-uuv-assistants"; version = "0.6.10"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "a1fca8150c90ca1a8b4c3960e38ee39acfbb5d99b4689d8cc6dd1b29d6804c7d"; }; - buildInputs = [ nav-msgs topic-tools sensor-msgs roscpp geometry-msgs tf ]; + buildInputs = [ tf sensor-msgs nav-msgs topic-tools roscpp geometry-msgs ]; propagatedBuildInputs = [ pythonPackages.numpy geometry-msgs sensor-msgs roscpp nav-msgs rosgraph rostopic visualization-msgs rospy topic-tools tf gazebo-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Tools and utilities to monitor and analyze the simulation''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-auv-control-allocator/default.nix b/melodic/uuv-auv-control-allocator/default.nix index d61df3a197..996a3c3d19 100644 --- a/melodic/uuv-auv-control-allocator/default.nix +++ b/melodic/uuv-auv-control-allocator/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Optimal allocation of forces and torques to thruster and fins of AUVs''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-control-cascaded-pid/default.nix b/melodic/uuv-control-cascaded-pid/default.nix index 7ff31cb7b3..3a5f64aeb1 100644 --- a/melodic/uuv-control-cascaded-pid/default.nix +++ b/melodic/uuv-control-cascaded-pid/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''A cascade of PID controllers for acceleration, velocity, and position control.''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-control-msgs/default.nix b/melodic/uuv-control-msgs/default.nix index 04a0467b6b..5b9c916c37 100644 --- a/melodic/uuv-control-msgs/default.nix +++ b/melodic/uuv-control-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The uuv_control_msgs package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-control-utils/default.nix b/melodic/uuv-control-utils/default.nix index e2e5afaaa4..4df2ea1aa6 100644 --- a/melodic/uuv-control-utils/default.nix +++ b/melodic/uuv-control-utils/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, uuv-trajectory-control, uuv-world-ros-plugins-msgs, catkin, pythonPackages, gazebo-msgs, nav-msgs, uuv-gazebo-ros-plugins-msgs, rospy, std-msgs, visualization-msgs, uuv-control-msgs, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, uuv-world-ros-plugins-msgs, uuv-trajectory-control, catkin, pythonPackages, gazebo-msgs, nav-msgs, uuv-gazebo-ros-plugins-msgs, rospy, std-msgs, visualization-msgs, uuv-control-msgs, geometry-msgs }: buildRosPackage { pname = "ros-melodic-uuv-control-utils"; version = "0.6.10"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "c2cd071c9d224113db678734c97021269285000c8ff1862a59ffa84b8197eb1e"; }; - propagatedBuildInputs = [ pythonPackages.numpy geometry-msgs uuv-trajectory-control uuv-world-ros-plugins-msgs pythonPackages.pyyaml nav-msgs uuv-gazebo-ros-plugins-msgs rospy std-msgs visualization-msgs uuv-control-msgs gazebo-msgs ]; + propagatedBuildInputs = [ pythonPackages.numpy geometry-msgs uuv-world-ros-plugins-msgs uuv-trajectory-control pythonPackages.pyyaml nav-msgs uuv-gazebo-ros-plugins-msgs rospy std-msgs visualization-msgs uuv-control-msgs gazebo-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The uuv_control_utils package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-descriptions/default.nix b/melodic/uuv-descriptions/default.nix index ec59b3dfff..8ac4079407 100644 --- a/melodic/uuv-descriptions/default.nix +++ b/melodic/uuv-descriptions/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; checkInputs = [ rostest rosunit xacro ]; - propagatedBuildInputs = [ gazebo-ros uuv-gazebo-ros-plugins uuv-sensor-ros-plugins robot-state-publisher uuv-assistants gazebo-ros-control ]; + propagatedBuildInputs = [ gazebo-ros uuv-gazebo-ros-plugins uuv-sensor-ros-plugins uuv-assistants robot-state-publisher gazebo-ros-control ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The uuv_descriptions package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-gazebo-plugins/default.nix b/melodic/uuv-gazebo-plugins/default.nix index 72bd8eb33e..cb39324f8e 100644 --- a/melodic/uuv-gazebo-plugins/default.nix +++ b/melodic/uuv-gazebo-plugins/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''UUV Simulator's Gazebo plugins for simulation of hydrodynamic and hydrostatic forces, and underwater actuators (e.g. thrusters and fins).''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-gazebo-ros-plugins-msgs/default.nix b/melodic/uuv-gazebo-ros-plugins-msgs/default.nix index ab24e083ae..4be612e544 100644 --- a/melodic/uuv-gazebo-ros-plugins-msgs/default.nix +++ b/melodic/uuv-gazebo-ros-plugins-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The uuv_gazebo_ros_plugins_msgs package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-gazebo-ros-plugins/default.nix b/melodic/uuv-gazebo-ros-plugins/default.nix index c70fef5f19..142f492961 100644 --- a/melodic/uuv-gazebo-ros-plugins/default.nix +++ b/melodic/uuv-gazebo-ros-plugins/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''UUV Simulator's extended ROS plugins for generation of the necessary ROS services and topics during the simulation.''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-gazebo-worlds/default.nix b/melodic/uuv-gazebo-worlds/default.nix index 83a3ab4bb1..d33b3b1881 100644 --- a/melodic/uuv-gazebo-worlds/default.nix +++ b/melodic/uuv-gazebo-worlds/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The uuv_gazebo_worlds package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-gazebo/default.nix b/melodic/uuv-gazebo/default.nix index 36b963f6ee..79fc947940 100644 --- a/melodic/uuv-gazebo/default.nix +++ b/melodic/uuv-gazebo/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''The uuv_gazebo package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-sensor-ros-plugins-msgs/default.nix b/melodic/uuv-sensor-ros-plugins-msgs/default.nix index 95f9ee5fd8..921553a11c 100644 --- a/melodic/uuv-sensor-ros-plugins-msgs/default.nix +++ b/melodic/uuv-sensor-ros-plugins-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The uuv_sensor_ros_plugins_msgs package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-sensor-ros-plugins/default.nix b/melodic/uuv-sensor-ros-plugins/default.nix index 4ed02795d4..ed32027185 100644 --- a/melodic/uuv-sensor-ros-plugins/default.nix +++ b/melodic/uuv-sensor-ros-plugins/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, xacro, sensor-msgs, catkin, uuv-sensor-ros-plugins-msgs, message-filters, tf2-ros, gazebo-dev, gazebo-plugins, roscpp, tf2, rostest, uuv-gazebo-plugins, std-msgs, tf, rosunit, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, xacro, sensor-msgs, catkin, uuv-sensor-ros-plugins-msgs, message-filters, tf2-ros, gazebo-plugins, gazebo-dev, roscpp, tf2, rostest, uuv-gazebo-plugins, std-msgs, tf, rosunit, geometry-msgs }: buildRosPackage { pname = "ros-melodic-uuv-sensor-ros-plugins"; version = "0.6.10"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "0d25b57ad18554d4a85c12a45612cd6a884f7e775fea8c90ed8d58ac2f0d0c36"; }; - buildInputs = [ sensor-msgs uuv-sensor-ros-plugins-msgs message-filters roscpp gazebo-plugins gazebo-dev tf2 tf2-ros uuv-gazebo-plugins std-msgs tf geometry-msgs ]; + buildInputs = [ sensor-msgs uuv-sensor-ros-plugins-msgs message-filters roscpp gazebo-dev gazebo-plugins tf2 tf2-ros uuv-gazebo-plugins std-msgs tf geometry-msgs ]; checkInputs = [ rostest rosunit xacro ]; - propagatedBuildInputs = [ sensor-msgs uuv-sensor-ros-plugins-msgs message-filters roscpp gazebo-plugins gazebo-dev tf2 tf2-ros uuv-gazebo-plugins std-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs uuv-sensor-ros-plugins-msgs message-filters roscpp gazebo-dev gazebo-plugins tf2 tf2-ros uuv-gazebo-plugins std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The uuv_sensor_ros_plugins package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-simulator/default.nix b/melodic/uuv-simulator/default.nix index 9fdf72beea..858cd2339b 100644 --- a/melodic/uuv-simulator/default.nix +++ b/melodic/uuv-simulator/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "b988f38574bfbd6ff69c04f4142e9f80372ba835626df529df899e212963094a"; }; - propagatedBuildInputs = [ uuv-assistants uuv-world-ros-plugins-msgs uuv-descriptions uuv-teleop uuv-thruster-manager uuv-gazebo uuv-control-cascaded-pid uuv-auv-control-allocator uuv-gazebo-ros-plugins uuv-world-plugins uuv-sensor-ros-plugins uuv-world-ros-plugins uuv-trajectory-control uuv-sensor-ros-plugins-msgs uuv-control-utils uuv-gazebo-ros-plugins-msgs uuv-gazebo-plugins uuv-gazebo-worlds uuv-control-msgs ]; + propagatedBuildInputs = [ uuv-world-ros-plugins-msgs uuv-descriptions uuv-teleop uuv-thruster-manager uuv-gazebo uuv-control-cascaded-pid uuv-world-plugins uuv-sensor-ros-plugins uuv-trajectory-control uuv-gazebo-ros-plugins-msgs uuv-gazebo-plugins uuv-gazebo-worlds uuv-control-msgs uuv-assistants uuv-auv-control-allocator uuv-gazebo-ros-plugins uuv-world-ros-plugins uuv-sensor-ros-plugins-msgs uuv-control-utils ]; nativeBuildInputs = [ catkin ]; meta = { description = ''uuv_simulator contains Gazebo plugins and ROS packages for modeling and simulating unmanned underwater vehicles''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-teleop/default.nix b/melodic/uuv-teleop/default.nix index aaf89d56ef..a04b71bf3e 100644 --- a/melodic/uuv-teleop/default.nix +++ b/melodic/uuv-teleop/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''ROS nodes to generate command topics for vehicles and manipulators using a joystick input''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-thruster-manager/default.nix b/melodic/uuv-thruster-manager/default.nix index 36eea2dd37..0ba462730e 100644 --- a/melodic/uuv-thruster-manager/default.nix +++ b/melodic/uuv-thruster-manager/default.nix @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ std-msgs message-generation ]; - propagatedBuildInputs = [ uuv-gazebo-ros-plugins-msgs message-runtime rospy std-msgs geometry-msgs tf pythonPackages.pyyaml ]; + propagatedBuildInputs = [ pythonPackages.pyyaml uuv-gazebo-ros-plugins-msgs message-runtime rospy std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The thruster manager package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-trajectory-control/default.nix b/melodic/uuv-trajectory-control/default.nix index 2c449cc09c..7200faf57c 100644 --- a/melodic/uuv-trajectory-control/default.nix +++ b/melodic/uuv-trajectory-control/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, tf, catkin, pythonPackages, rostest, nav-msgs, visualization-msgs, rospy, std-msgs, roslib, uuv-control-msgs, rosunit, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, catkin, pythonPackages, rostest, roslib, nav-msgs, visualization-msgs, rospy, std-msgs, tf, uuv-control-msgs, rosunit, geometry-msgs }: buildRosPackage { pname = "ros-melodic-uuv-trajectory-control"; version = "0.6.10"; @@ -13,11 +13,11 @@ buildRosPackage { }; checkInputs = [ rostest rosunit ]; - propagatedBuildInputs = [ pythonPackages.numpy tf pythonPackages.scipy pythonPackages.pyyaml nav-msgs visualization-msgs rospy std-msgs roslib uuv-control-msgs pythonPackages.matplotlib geometry-msgs ]; + propagatedBuildInputs = [ pythonPackages.numpy pythonPackages.scipy pythonPackages.pyyaml roslib nav-msgs visualization-msgs rospy std-msgs tf uuv-control-msgs pythonPackages.matplotlib geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The uuv_trajectory_control package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-world-plugins/default.nix b/melodic/uuv-world-plugins/default.nix index ba9258a4ee..4363f202cc 100644 --- a/melodic/uuv-world-plugins/default.nix +++ b/melodic/uuv-world-plugins/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The uuv_world_plugins package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-world-ros-plugins-msgs/default.nix b/melodic/uuv-world-ros-plugins-msgs/default.nix index 75c9f51208..b56f598959 100644 --- a/melodic/uuv-world-ros-plugins-msgs/default.nix +++ b/melodic/uuv-world-ros-plugins-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The uuv_world_ros_plugins_msgs package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uuv-world-ros-plugins/default.nix b/melodic/uuv-world-ros-plugins/default.nix index 64aeace660..918c676701 100644 --- a/melodic/uuv-world-ros-plugins/default.nix +++ b/melodic/uuv-world-ros-plugins/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, uuv-world-plugins, uuv-world-ros-plugins-msgs, catkin, gazebo-msgs, gazebo-dev, roscpp, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, uuv-world-plugins, geometry-msgs, uuv-world-ros-plugins-msgs, catkin, gazebo-dev, roscpp, gazebo-msgs }: buildRosPackage { pname = "ros-melodic-uuv-world-ros-plugins"; version = "0.6.10"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "0bb8f7fb759854a6cbea931882f28f926a74eded1d59addbb24ffa388ca95ef5"; }; - buildInputs = [ uuv-world-plugins geometry-msgs uuv-world-ros-plugins-msgs roscpp gazebo-msgs gazebo-dev ]; - propagatedBuildInputs = [ uuv-world-plugins geometry-msgs uuv-world-ros-plugins-msgs roscpp gazebo-msgs gazebo-dev ]; + buildInputs = [ uuv-world-plugins geometry-msgs uuv-world-ros-plugins-msgs gazebo-dev roscpp gazebo-msgs ]; + propagatedBuildInputs = [ uuv-world-plugins geometry-msgs uuv-world-ros-plugins-msgs gazebo-dev roscpp gazebo-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The uuv_world_ros_plugins package''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/uvc-camera/default.nix b/melodic/uvc-camera/default.nix index 66cc269d63..79bfb55423 100644 --- a/melodic/uvc-camera/default.nix +++ b/melodic/uvc-camera/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "3a760fad6164fa6a5ed47d7cd6302f5378bae282f5018dc568d2666b867cdb46"; }; - buildInputs = [ libv4l camera-info-manager image-transport sensor-msgs nodelet roscpp ]; - propagatedBuildInputs = [ libv4l camera-info-manager image-transport sensor-msgs nodelet roscpp ]; + buildInputs = [ camera-info-manager image-transport sensor-msgs roscpp libv4l nodelet ]; + propagatedBuildInputs = [ camera-info-manager image-transport sensor-msgs roscpp libv4l nodelet ]; nativeBuildInputs = [ catkin ]; meta = { @@ -23,6 +23,6 @@ buildRosPackage { for stereo vision. Currently uses the base driver from Morgan Quigley's uvc_cam package.''; - #license = lib.licenses.GPLv2; + license = with lib.licenses; [ gpl2 ]; }; } diff --git a/melodic/vapor-master/default.nix b/melodic/vapor-master/default.nix index aeb26050a4..04b176196f 100644 --- a/melodic/vapor-master/default.nix +++ b/melodic/vapor-master/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''high availability ros master''; - #license = lib.licenses.Apache-2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/variant-msgs/default.nix b/melodic/variant-msgs/default.nix index 4b8f2ac35f..12e47137e2 100644 --- a/melodic/variant-msgs/default.nix +++ b/melodic/variant-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''Variant messages are designed to accommodate the information content of any invariant message. They are truly generic and can freely be converted to and from specific message objects.''; - #license = lib.licenses.GNU Lesser General Public License (LGPL); + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/variant-topic-test/default.nix b/melodic/variant-topic-test/default.nix index a33b7dbbb0..625ad04486 100644 --- a/melodic/variant-topic-test/default.nix +++ b/melodic/variant-topic-test/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "bfb1f587202ae563d3c7c967de21660efdd00723675a8e16ae0b9592fc7d5142"; }; - buildInputs = [ geometry-msgs std-msgs variant-topic-tools variant-msgs roscpp ]; - propagatedBuildInputs = [ geometry-msgs std-msgs variant-topic-tools variant-msgs roscpp ]; + buildInputs = [ roscpp std-msgs variant-topic-tools variant-msgs geometry-msgs ]; + propagatedBuildInputs = [ roscpp std-msgs variant-topic-tools variant-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Variant topic tools testing suites.''; - #license = lib.licenses.GNU Lesser General Public License (LGPL); + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/variant-topic-tools/default.nix b/melodic/variant-topic-tools/default.nix index d4c27e0eb7..82de651b51 100644 --- a/melodic/variant-topic-tools/default.nix +++ b/melodic/variant-topic-tools/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Topic tools for treating messages as variant types.''; - #license = lib.licenses.GNU Lesser General Public License (LGPL); + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/variant/default.nix b/melodic/variant/default.nix index 07e257f8f7..cb83e35368 100644 --- a/melodic/variant/default.nix +++ b/melodic/variant/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Meta-package for the universal variant library.''; - #license = lib.licenses.GNU Lesser General Public License (LGPL); + license = with lib.licenses; [ lgpl2 ]; }; } diff --git a/melodic/velocity-controllers/default.nix b/melodic/velocity-controllers/default.nix index cbc2fac403..05dda3427f 100644 --- a/melodic/velocity-controllers/default.nix +++ b/melodic/velocity-controllers/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "7a2b419156bb96923bd97e0ffe3ffda525f2fdc4027868c461590c749c379cbb"; }; - buildInputs = [ realtime-tools urdf controller-interface control-msgs angles control-toolbox forward-command-controller ]; - propagatedBuildInputs = [ realtime-tools urdf controller-interface control-msgs angles control-toolbox forward-command-controller ]; + buildInputs = [ control-msgs control-toolbox realtime-tools controller-interface urdf angles forward-command-controller ]; + propagatedBuildInputs = [ control-msgs control-toolbox realtime-tools controller-interface urdf angles forward-command-controller ]; nativeBuildInputs = [ catkin ]; meta = { description = ''velocity_controllers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/velodyne-description/default.nix b/melodic/velodyne-description/default.nix index a141e56816..006314a22a 100644 --- a/melodic/velodyne-description/default.nix +++ b/melodic/velodyne-description/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''URDF and meshes describing Velodyne laser scanners.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/velodyne-driver/default.nix b/melodic/velodyne-driver/default.nix index 5a1da96a76..bad98145d6 100644 --- a/melodic/velodyne-driver/default.nix +++ b/melodic/velodyne-driver/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, roslaunch, pluginlib, libpcap, catkin, roscpp, diagnostic-updater, rostest, nodelet, velodyne-msgs, dynamic-reconfigure, tf }: +{ lib, buildRosPackage, fetchurl, roslaunch, pluginlib, libpcap, tf, catkin, diagnostic-updater, rostest, nodelet, velodyne-msgs, dynamic-reconfigure, roscpp }: buildRosPackage { pname = "ros-melodic-velodyne-driver"; version = "1.5.2"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "81b88ba93fe2af5da93cb4e2a8865912c11f35985cbb3636bf480c568b7a6fe4"; }; - buildInputs = [ diagnostic-updater pluginlib libpcap dynamic-reconfigure nodelet tf velodyne-msgs roscpp ]; + buildInputs = [ pluginlib libpcap velodyne-msgs roscpp diagnostic-updater nodelet dynamic-reconfigure tf ]; checkInputs = [ rostest roslaunch ]; - propagatedBuildInputs = [ diagnostic-updater pluginlib libpcap dynamic-reconfigure nodelet tf velodyne-msgs roscpp ]; + propagatedBuildInputs = [ pluginlib libpcap velodyne-msgs roscpp diagnostic-updater nodelet dynamic-reconfigure tf ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS device driver for Velodyne 3D LIDARs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/velodyne-gazebo-plugins/default.nix b/melodic/velodyne-gazebo-plugins/default.nix index 2337f36712..80efbcda3e 100644 --- a/melodic/velodyne-gazebo-plugins/default.nix +++ b/melodic/velodyne-gazebo-plugins/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Gazebo plugin to provide simulated data from Velodyne laser scanners.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/velodyne-laserscan/default.nix b/melodic/velodyne-laserscan/default.nix index 2cf3714e46..41485e5813 100644 --- a/melodic/velodyne-laserscan/default.nix +++ b/melodic/velodyne-laserscan/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Extract a single ring of a Velodyne PointCloud2 and publish it as a LaserScan message''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/velodyne-msgs/default.nix b/melodic/velodyne-msgs/default.nix index 53280ffc69..02abda7c3a 100644 --- a/melodic/velodyne-msgs/default.nix +++ b/melodic/velodyne-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS message definitions for Velodyne 3D LIDARs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/velodyne-pointcloud/default.nix b/melodic/velodyne-pointcloud/default.nix index 54cfc51610..99af805e36 100644 --- a/melodic/velodyne-pointcloud/default.nix +++ b/melodic/velodyne-pointcloud/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, velodyne-driver, pcl-ros, dynamic-reconfigure, tf, pcl-conversions, velodyne-laserscan, angles, roslaunch, roslib, catkin, tf2-ros, roscpp, nodelet, pluginlib, libyamlcpp, sensor-msgs, rostest, velodyne-msgs, rosunit }: +{ lib, buildRosPackage, fetchurl, velodyne-driver, dynamic-reconfigure, pcl-ros, tf, pcl-conversions, velodyne-laserscan, angles, roslaunch, roslib, catkin, tf2-ros, nodelet, roscpp, pluginlib, libyamlcpp, sensor-msgs, rostest, velodyne-msgs, rosunit }: buildRosPackage { pname = "ros-melodic-velodyne-pointcloud"; version = "1.5.2"; @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "4ba277761a8c63407bf615e2aae6edf06f70f5c0349717afa3fc8be4d828dc76"; }; - buildInputs = [ pluginlib tf pcl-conversions sensor-msgs libyamlcpp velodyne-driver roscpp nodelet velodyne-msgs angles dynamic-reconfigure roslib pcl-ros ]; + buildInputs = [ pluginlib libyamlcpp velodyne-driver sensor-msgs velodyne-msgs roscpp roslib nodelet pcl-ros angles dynamic-reconfigure tf pcl-conversions ]; checkInputs = [ rostest roslaunch rosunit tf2-ros ]; - propagatedBuildInputs = [ pluginlib velodyne-laserscan libyamlcpp pcl-conversions sensor-msgs velodyne-driver roscpp roslib nodelet velodyne-msgs angles dynamic-reconfigure tf pcl-ros ]; + propagatedBuildInputs = [ pluginlib velodyne-laserscan libyamlcpp velodyne-driver sensor-msgs velodyne-msgs roscpp roslib nodelet pcl-ros angles dynamic-reconfigure tf pcl-conversions ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Point cloud conversions for Velodyne 3D LIDARs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/velodyne-simulator/default.nix b/melodic/velodyne-simulator/default.nix index 7746ed39ad..8f65c4170b 100644 --- a/melodic/velodyne-simulator/default.nix +++ b/melodic/velodyne-simulator/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Metapackage allowing easy installation of Velodyne simulation components.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/velodyne/default.nix b/melodic/velodyne/default.nix index bad060c576..241aacf2e7 100644 --- a/melodic/velodyne/default.nix +++ b/melodic/velodyne/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Basic ROS support for the Velodyne 3D LIDARs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/video-stream-opencv/default.nix b/melodic/video-stream-opencv/default.nix index 3bf5ecd1cd..43b42b4203 100644 --- a/melodic/video-stream-opencv/default.nix +++ b/melodic/video-stream-opencv/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "ed2b46c502c9f63dbc62af074bbf0407d249c84f8509227ae5d2346204fe1186"; }; - buildInputs = [ rospy camera-info-manager image-transport sensor-msgs cv-bridge roscpp ]; - propagatedBuildInputs = [ rospy camera-info-manager image-transport sensor-msgs cv-bridge roscpp ]; + buildInputs = [ camera-info-manager image-transport sensor-msgs cv-bridge rospy roscpp ]; + propagatedBuildInputs = [ camera-info-manager image-transport sensor-msgs cv-bridge rospy roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The video_stream_opencv package contains a node to publish a video stream (the protocols that opencv supports are supported, including rtsp, webcams on /dev/video and video files) in ROS image topics, it supports camera info and basic image flipping (horizontal, vertical or both) capabilities, also adjusting publishing rate.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/view-controller-msgs/default.nix b/melodic/view-controller-msgs/default.nix index 7ed793b9e0..2c8ac3cff1 100644 --- a/melodic/view-controller-msgs/default.nix +++ b/melodic/view-controller-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Messages for (camera) view controllers''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/virtual-force-publisher/default.nix b/melodic/virtual-force-publisher/default.nix index ee3586286e..5193267cec 100644 --- a/melodic/virtual-force-publisher/default.nix +++ b/melodic/virtual-force-publisher/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "12b7dd32a18a6b444d59d0dacd15781a6ea157a23924c04dc1aa7ca176de8a20"; }; - buildInputs = [ urdf kdl-parser tf-conversions sensor-msgs geometry-msgs ]; - propagatedBuildInputs = [ urdf kdl-parser tf-conversions sensor-msgs geometry-msgs ]; + buildInputs = [ kdl-parser sensor-msgs urdf tf-conversions geometry-msgs ]; + propagatedBuildInputs = [ kdl-parser sensor-msgs urdf tf-conversions geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''publish end effector's force, which is estmated from joint torque value''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/vision-msgs/default.nix b/melodic/vision-msgs/default.nix index b08c65b4a6..6241b73393 100644 --- a/melodic/vision-msgs/default.nix +++ b/melodic/vision-msgs/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "aea7d0a539a76bbd0072f74bb3c7ebc0a7f3b3277963f8d696de42a5c4066e90"; }; - buildInputs = [ message-generation message-runtime std-msgs sensor-msgs geometry-msgs ]; + buildInputs = [ sensor-msgs message-generation message-runtime std-msgs geometry-msgs ]; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ message-generation message-runtime std-msgs sensor-msgs geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs message-generation message-runtime std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Messages for interfacing with various computer vision pipelines, such as object detectors.''; - #license = lib.licenses.Apache License 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/vision-opencv/default.nix b/melodic/vision-opencv/default.nix index 1c2b9d66c3..581b40d561 100644 --- a/melodic/vision-opencv/default.nix +++ b/melodic/vision-opencv/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Packages for interfacing ROS with OpenCV, a library of programming functions for real time computer vision.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/visualization-marker-tutorials/default.nix b/melodic/visualization-marker-tutorials/default.nix index e04764923d..c0cfe4f333 100644 --- a/melodic/visualization-marker-tutorials/default.nix +++ b/melodic/visualization-marker-tutorials/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The visulalization_marker_tutorials package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/visualization-msgs/default.nix b/melodic/visualization-msgs/default.nix index dace208421..72838a16d2 100644 --- a/melodic/visualization-msgs/default.nix +++ b/melodic/visualization-msgs/default.nix @@ -22,6 +22,6 @@ buildRosPackage { The main messages in visualization_msgs is visualization_msgs/Marker. The marker message is used to send visualization "markers" such as boxes, spheres, arrows, lines, etc. to a visualization environment such as rviz. See the rviz tutorial rviz tutorials for more information.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/visualization-tutorials/default.nix b/melodic/visualization-tutorials/default.nix index 2d6c3ea5b7..8871b2660d 100644 --- a/melodic/visualization-tutorials/default.nix +++ b/melodic/visualization-tutorials/default.nix @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "5f67b564a5f87b4d7113b97de74e987a956d3985dac7639204b4ba697a056007"; }; - propagatedBuildInputs = [ librviz-tutorial interactive-marker-tutorials rviz-python-tutorial visualization-marker-tutorials rviz-plugin-tutorials ]; + propagatedBuildInputs = [ librviz-tutorial visualization-marker-tutorials interactive-marker-tutorials rviz-python-tutorial rviz-plugin-tutorials ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Metapackage referencing tutorials related to rviz and visualization.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/viz/default.nix b/melodic/viz/default.nix index c7bcd7b16b..3ba47b5843 100644 --- a/melodic/viz/default.nix +++ b/melodic/viz/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A metapackage to aggregate several packages.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/voice-text/default.nix b/melodic/voice-text/default.nix index c00c65b13f..266edaf92d 100644 --- a/melodic/voice-text/default.nix +++ b/melodic/voice-text/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''voice_text (www.voicetext.jp)''; - #license = lib.licenses.HOYA License; + license = with lib.licenses; [ "HOYA License" ]; }; } diff --git a/melodic/volksbot-driver/default.nix b/melodic/volksbot-driver/default.nix index ee4584f29c..68ca356321 100644 --- a/melodic/volksbot-driver/default.nix +++ b/melodic/volksbot-driver/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "c8cb933054437dd270a0a2171f0dc56922538911d1b32ea5dbb1cea60bd95880"; }; - buildInputs = [ nav-msgs epos2-motor-controller geometry-msgs sensor-msgs tf roscpp ]; - propagatedBuildInputs = [ nav-msgs epos2-motor-controller geometry-msgs sensor-msgs tf roscpp ]; + buildInputs = [ sensor-msgs epos2-motor-controller roscpp nav-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs epos2-motor-controller roscpp nav-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Driver for the Volksbot robot.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/voxel-grid/default.nix b/melodic/voxel-grid/default.nix index 1ccfa1036e..6b597e5413 100644 --- a/melodic/voxel-grid/default.nix +++ b/melodic/voxel-grid/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''voxel_grid provides an implementation of an efficient 3D voxel grid. The occupancy grid can support 3 different representations for the state of a cell: marked, free, or unknown. Due to the underlying implementation relying on bitwise and and or integer operations, the voxel grid only supports 16 different levels per voxel column. However, this limitation yields raytracing and cell marking performance in the grid comparable to standard 2D structures making it quite fast compared to most 3D structures.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/vrpn-client-ros/default.nix b/melodic/vrpn-client-ros/default.nix index 00c6a71738..0d04db786d 100644 --- a/melodic/vrpn-client-ros/default.nix +++ b/melodic/vrpn-client-ros/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ROS client nodes for the VRPN library, compatible with VICON, OptiTrack, and other hardware interfaces.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/vrpn/default.nix b/melodic/vrpn/default.nix index 6669291491..2cb1c25d6b 100644 --- a/melodic/vrpn/default.nix +++ b/melodic/vrpn/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''The VRPN is a library and set of servers that interfaces with virtual-reality systems, such as VICON, OptiTrack, and others.''; - #license = lib.licenses.BSL1.0; + license = with lib.licenses; [ "BSL1.0" ]; }; } diff --git a/melodic/vrx-gazebo/default.nix b/melodic/vrx-gazebo/default.nix index e399b6782f..884bc3b683 100644 --- a/melodic/vrx-gazebo/default.nix +++ b/melodic/vrx-gazebo/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The ROS package for the RobotX competition running in Gazebo.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/wamv-description/default.nix b/melodic/wamv-description/default.nix index 5340c86086..81e8b32f9e 100644 --- a/melodic/wamv-description/default.nix +++ b/melodic/wamv-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package provides a URDF model of WAM-V''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/wamv-gazebo/default.nix b/melodic/wamv-gazebo/default.nix index 9bd39bc298..09aeb7cd59 100644 --- a/melodic/wamv-gazebo/default.nix +++ b/melodic/wamv-gazebo/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "108c898691498d09b8946e2d081c9e3f8f3c247db5bfd785df968d4ae28dd189"; }; - buildInputs = [ robot-localization usv-gazebo-plugins velodyne-gazebo-plugins hector-gazebo-plugins xacro wamv-description gazebo-plugins ]; - propagatedBuildInputs = [ robot-localization usv-gazebo-plugins velodyne-gazebo-plugins hector-gazebo-plugins xacro wamv-description gazebo-plugins ]; + buildInputs = [ hector-gazebo-plugins wamv-description gazebo-plugins robot-localization usv-gazebo-plugins velodyne-gazebo-plugins xacro ]; + propagatedBuildInputs = [ hector-gazebo-plugins wamv-description gazebo-plugins robot-localization usv-gazebo-plugins velodyne-gazebo-plugins xacro ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Provides templates and examples for integrating the WAM-V model into gazebo with dynamics, sensors, etc.''; - #license = lib.licenses.Apache 2.0; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/melodic/warehouse-ros/default.nix b/melodic/warehouse-ros/default.nix index e587080949..9e76a540a6 100644 --- a/melodic/warehouse-ros/default.nix +++ b/melodic/warehouse-ros/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "8e5fa9db4aea56c8bebc4514900b75d2f8bfdeb3d7ae664b4f991273f59b4dfe"; }; - buildInputs = [ pluginlib geometry-msgs std-msgs tf rostime roscpp ]; + buildInputs = [ pluginlib tf rostime std-msgs roscpp geometry-msgs ]; checkInputs = [ rostest gtest ]; - propagatedBuildInputs = [ pluginlib boost geometry-msgs std-msgs tf rostime roscpp ]; + propagatedBuildInputs = [ pluginlib boost rostime roscpp std-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Persistent storage of ROS messages''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/web-video-server/default.nix b/melodic/web-video-server/default.nix index 6d418e2a06..69034550f8 100644 --- a/melodic/web-video-server/default.nix +++ b/melodic/web-video-server/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "f9939d41942b68c98fd43940bcccc09d257bd981021d01d64afeaf7f0a77cca8"; }; - buildInputs = [ roslib cv-bridge async-web-server-cpp image-transport sensor-msgs roscpp ffmpeg ]; - propagatedBuildInputs = [ roslib cv-bridge async-web-server-cpp image-transport sensor-msgs roscpp ffmpeg ]; + buildInputs = [ async-web-server-cpp image-transport sensor-msgs cv-bridge ffmpeg roslib roscpp ]; + propagatedBuildInputs = [ async-web-server-cpp image-transport sensor-msgs cv-bridge ffmpeg roslib roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''HTTP Streaming of ROS Image Topics in Multiple Formats''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/webkit-dependency/default.nix b/melodic/webkit-dependency/default.nix index dd14cdb104..31e0127196 100644 --- a/melodic/webkit-dependency/default.nix +++ b/melodic/webkit-dependency/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''This encapsulates the WebKit dependency for a specific ROS distribution and its Qt version''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/webrtc-ros/default.nix b/melodic/webrtc-ros/default.nix index 93763c0a08..3b9593f1f0 100644 --- a/melodic/webrtc-ros/default.nix +++ b/melodic/webrtc-ros/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "2e24d39a6cf8c98c8f2b9229dd5a0fabd731cf495abf76547baf476d26b98f96"; }; - buildInputs = [ cv-bridge async-web-server-cpp webrtc image-transport nodelet roscpp ]; - propagatedBuildInputs = [ cv-bridge async-web-server-cpp webrtc image-transport nodelet roscpp ]; + buildInputs = [ async-web-server-cpp webrtc image-transport cv-bridge roscpp nodelet ]; + propagatedBuildInputs = [ async-web-server-cpp webrtc image-transport cv-bridge roscpp nodelet ]; nativeBuildInputs = [ catkin ]; meta = { description = ''A collection of ROS utilities for using WebRTC with ROS''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/webrtc/default.nix b/melodic/webrtc/default.nix index 43035550b6..2d4cdf9598 100644 --- a/melodic/webrtc/default.nix +++ b/melodic/webrtc/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "bdc2b6651bda28702a87bdc1cb9a53dbcd5a47dc7363d71bd81ea87dc0271e77"; }; - buildInputs = [ alsaLib pulseaudio gtk3 gtk2 glib ]; - propagatedBuildInputs = [ alsaLib pulseaudio gtk3 gtk2 glib ]; + buildInputs = [ pulseaudio gtk3 gtk2 alsaLib glib ]; + propagatedBuildInputs = [ pulseaudio gtk3 gtk2 alsaLib glib ]; nativeBuildInputs = [ git cmake wget ]; meta = { description = ''WebRTC Native API''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/wge100-camera-firmware/default.nix b/melodic/wge100-camera-firmware/default.nix new file mode 100644 index 0000000000..d7c762d184 --- /dev/null +++ b/melodic/wge100-camera-firmware/default.nix @@ -0,0 +1,27 @@ + +# Copyright 2019 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, rostest, catkin, gforth, rospy }: +buildRosPackage { + pname = "ros-melodic-wge100-camera-firmware"; + version = "1.8.2-r1"; + + src = fetchurl { + url = https://github.com/ros-drivers-gbp/wge100_driver-release/archive/release/melodic/wge100_camera_firmware/1.8.2-1.tar.gz; + sha256 = "4e0908e101472e4247b1c23782764c9576b37103db122bd196de406e9e951e50"; + }; + + buildInputs = [ gforth rospy ]; + checkInputs = [ rostest ]; + propagatedBuildInputs = [ gforth rospy ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Source for the WGE100 Ethernet camera: Verilog source for the + FPGA, Forth source for the camera firmware. Intended for camera + developers. Note that a built binary from this package is checked + in under wge100_camera/firmware_images/''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/melodic/wge100-camera/default.nix b/melodic/wge100-camera/default.nix new file mode 100644 index 0000000000..775e6f250c --- /dev/null +++ b/melodic/wge100-camera/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2019 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, self-test, camera-calibration-parsers, image-transport, sensor-msgs, catkin, driver-base, timestamp-tools, diagnostic-updater, rostest, message-generation, message-runtime, rospy, std-msgs, dynamic-reconfigure, roscpp }: +buildRosPackage { + pname = "ros-melodic-wge100-camera"; + version = "1.8.2-r1"; + + src = fetchurl { + url = https://github.com/ros-drivers-gbp/wge100_driver-release/archive/release/melodic/wge100_camera/1.8.2-1.tar.gz; + sha256 = "555d7b0249e43457e5ce245fb1c7fe895a0510b8a142197717e046e7cc1e18fe"; + }; + + buildInputs = [ self-test camera-calibration-parsers image-transport sensor-msgs driver-base timestamp-tools diagnostic-updater rostest rospy message-generation dynamic-reconfigure std-msgs roscpp ]; + propagatedBuildInputs = [ self-test camera-calibration-parsers image-transport sensor-msgs driver-base timestamp-tools diagnostic-updater rospy message-runtime dynamic-reconfigure std-msgs roscpp ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''A ROS node and assorted tools to provide access to the WGE100 + camera used in the forearms and the stereo cameras of the PR2 + robot.''; + license = with lib.licenses; [ gpl1 ]; + }; +} diff --git a/melodic/wge100-driver/default.nix b/melodic/wge100-driver/default.nix new file mode 100644 index 0000000000..809d0d19eb --- /dev/null +++ b/melodic/wge100-driver/default.nix @@ -0,0 +1,22 @@ + +# Copyright 2019 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, wge100-camera-firmware, catkin, wge100-camera }: +buildRosPackage { + pname = "ros-melodic-wge100-driver"; + version = "1.8.2-r1"; + + src = fetchurl { + url = https://github.com/ros-drivers-gbp/wge100_driver-release/archive/release/melodic/wge100_driver/1.8.2-1.tar.gz; + sha256 = "1ad42f5a276e3238007f5c28d16536288c3cccb009e4a0822eaf86304d2ec153"; + }; + + propagatedBuildInputs = [ wge100-camera-firmware wge100-camera ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''This stack contains the ROS driver and firmware for the WGE100 camera used on the PR2 robot.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/melodic/wifi-ddwrt/default.nix b/melodic/wifi-ddwrt/default.nix index 6d7bb70771..71aad7472a 100644 --- a/melodic/wifi-ddwrt/default.nix +++ b/melodic/wifi-ddwrt/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Access to the DD-WRT wifi''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/willow-maps/default.nix b/melodic/willow-maps/default.nix index 9256f1471b..c7da0b29ba 100644 --- a/melodic/willow-maps/default.nix +++ b/melodic/willow-maps/default.nix @@ -16,6 +16,6 @@ buildRosPackage { meta = { description = ''Holds maps of Willow Garage that can be used for a number of different applications.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/wu-ros-tools/default.nix b/melodic/wu-ros-tools/default.nix index 961ea089c2..c50f135fc5 100644 --- a/melodic/wu-ros-tools/default.nix +++ b/melodic/wu-ros-tools/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''A collection of tools for making a variety of generic ROS-related tasks easier.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/xacro/default.nix b/melodic/xacro/default.nix index 85f3c4171b..0753c67e28 100644 --- a/melodic/xacro/default.nix +++ b/melodic/xacro/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''Xacro (XML Macros) Xacro is an XML macro language. With xacro, you can construct shorter and more readable XML files by using macros that expand to larger XML expressions.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/xmlrpcpp/default.nix b/melodic/xmlrpcpp/default.nix index 4bbf635085..75b0de0eae 100644 --- a/melodic/xmlrpcpp/default.nix +++ b/melodic/xmlrpcpp/default.nix @@ -22,6 +22,6 @@ buildRosPackage { heavily modified from the package available on SourceForge in order to support roscpp's threading model. As such, we are maintaining our own fork.''; - #license = lib.licenses.LGPL-2.1; + license = with lib.licenses; [ lgpl21 ]; }; } diff --git a/melodic/xpp-examples/default.nix b/melodic/xpp-examples/default.nix index 5bd14eb785..81cddebe3b 100644 --- a/melodic/xpp-examples/default.nix +++ b/melodic/xpp-examples/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "df300b82eb4135d5c0343d75f1c11dc6e3c03df09b07582ab3a4f753338522df"; }; - buildInputs = [ xpp-quadrotor xpp-hyq rosbag roscpp xpp-vis ]; - propagatedBuildInputs = [ xpp-quadrotor xpp-hyq rosbag roscpp xpp-vis ]; + buildInputs = [ xpp-quadrotor xpp-hyq rosbag xpp-vis roscpp ]; + propagatedBuildInputs = [ xpp-quadrotor xpp-hyq rosbag xpp-vis roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Examples of how to use the xpp framework.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/xpp-hyq/default.nix b/melodic/xpp-hyq/default.nix index 49711906da..723abe7916 100644 --- a/melodic/xpp-hyq/default.nix +++ b/melodic/xpp-hyq/default.nix @@ -27,6 +27,6 @@ buildRosPackage { here. See also IIT.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/xpp-msgs/default.nix b/melodic/xpp-msgs/default.nix index c4ea1bd27d..a65a40c8d7 100644 --- a/melodic/xpp-msgs/default.nix +++ b/melodic/xpp-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "0835118248689817293f9399f3c3a7ece360dc9b6ac866ba80fa8c0c74554cd5"; }; - buildInputs = [ message-generation message-runtime std-msgs sensor-msgs geometry-msgs ]; - propagatedBuildInputs = [ message-generation message-runtime std-msgs sensor-msgs geometry-msgs ]; + buildInputs = [ sensor-msgs message-generation message-runtime std-msgs geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs message-generation message-runtime std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS messages used in the XPP framework.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/xpp-quadrotor/default.nix b/melodic/xpp-quadrotor/default.nix index c327c802ac..0b358d9287 100644 --- a/melodic/xpp-quadrotor/default.nix +++ b/melodic/xpp-quadrotor/default.nix @@ -23,6 +23,6 @@ buildRosPackage { Adapted from Daniel Mellinger, Nathan Michael, Vijay Kumar, "Trajectory Generation and Control for Precise Aggressive Maneuvers with Quadrotors".''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/xpp-states/default.nix b/melodic/xpp-states/default.nix index 39db3f8d01..c2507bb2a7 100644 --- a/melodic/xpp-states/default.nix +++ b/melodic/xpp-states/default.nix @@ -21,6 +21,6 @@ buildRosPackage { angular rates) and robot definitions in Cartesian and joint state used in the Xpp Motion Framework, as well as conversions to/from xpp_msgs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/xpp-vis/default.nix b/melodic/xpp-vis/default.nix index aaf7168f27..b36d457343 100644 --- a/melodic/xpp-vis/default.nix +++ b/melodic/xpp-vis/default.nix @@ -12,13 +12,13 @@ buildRosPackage { sha256 = "a28dddd1ac40ec97257e52ee5f1dc6b2a0989fcf0fceccba4698019bbcfe56e7"; }; - buildInputs = [ xpp-states xpp-msgs kdl-parser robot-state-publisher visualization-msgs tf roscpp ]; + buildInputs = [ xpp-states xpp-msgs kdl-parser tf robot-state-publisher visualization-msgs roscpp ]; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ xpp-states xpp-msgs kdl-parser robot-state-publisher visualization-msgs tf roscpp ]; + propagatedBuildInputs = [ xpp-states xpp-msgs kdl-parser tf robot-state-publisher visualization-msgs roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Visualization for the XPP Motion Framework.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/xpp/default.nix b/melodic/xpp/default.nix index 2fd413eeb4..2f739dbe07 100644 --- a/melodic/xpp/default.nix +++ b/melodic/xpp/default.nix @@ -12,7 +12,7 @@ buildRosPackage { sha256 = "b5df600ccf29b0c24148d6eac7312ddd566f19024c48a49779a9f6905cef89ee"; }; - propagatedBuildInputs = [ xpp-states xpp-msgs xpp-quadrotor xpp-hyq xpp-examples xpp-vis ]; + propagatedBuildInputs = [ xpp-states xpp-msgs xpp-quadrotor xpp-hyq xpp-vis xpp-examples ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { HyQ. Example motions were generated by towr.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/xsens-driver/default.nix b/melodic/xsens-driver/default.nix index bddf140a07..6c71bc77fc 100644 --- a/melodic/xsens-driver/default.nix +++ b/melodic/xsens-driver/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "bf0a13bb4fd0e2891ca1f6b18c1d8bb071f8eb2446a07ee31abb850d821da693"; }; - buildInputs = [ rospy std-msgs diagnostic-msgs sensor-msgs tf geometry-msgs ]; - propagatedBuildInputs = [ pythonPackages.pyserial rospy std-msgs diagnostic-msgs sensor-msgs tf geometry-msgs ]; + buildInputs = [ sensor-msgs rospy std-msgs diagnostic-msgs tf geometry-msgs ]; + propagatedBuildInputs = [ pythonPackages.pyserial sensor-msgs rospy std-msgs diagnostic-msgs tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''ROS Driver for XSens MT/MTi/MTi-G devices.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/xv-11-laser-driver/default.nix b/melodic/xv-11-laser-driver/default.nix index 3f8a97816a..02aa4473b8 100644 --- a/melodic/xv-11-laser-driver/default.nix +++ b/melodic/xv-11-laser-driver/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Neato XV-11 Laser Driver. This driver works with the laser when it is removed from the XV-11 Robot as opposed to reading scans from the Neato's USB port.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-ar-marker-tracking/default.nix b/melodic/yocs-ar-marker-tracking/default.nix index bbb29e05f0..3e6e881a33 100644 --- a/melodic/yocs-ar-marker-tracking/default.nix +++ b/melodic/yocs-ar-marker-tracking/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "10cb24072d6c3a4eb12bd24686276fe3ee8b70ec4cef5c4e38257fdd5bdf0ac7"; }; - buildInputs = [ ar-track-alvar-msgs libyamlcpp sensor-msgs roscpp yocs-math-toolkit geometry-msgs ]; - propagatedBuildInputs = [ ar-track-alvar-msgs libyamlcpp sensor-msgs roscpp yocs-math-toolkit geometry-msgs ]; + buildInputs = [ libyamlcpp sensor-msgs yocs-math-toolkit ar-track-alvar-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ libyamlcpp sensor-msgs yocs-math-toolkit ar-track-alvar-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Collecting, tracking and generating statistics for ar markers from ar_track_alvar.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-ar-pair-approach/default.nix b/melodic/yocs-ar-pair-approach/default.nix index 5c593000c1..f865f8ac8e 100644 --- a/melodic/yocs-ar-pair-approach/default.nix +++ b/melodic/yocs-ar-pair-approach/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Search and approach behaviour, moving to a target in front of a pair of ar markers.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-ar-pair-tracking/default.nix b/melodic/yocs-ar-pair-tracking/default.nix index 3852901f28..a57e05ff33 100644 --- a/melodic/yocs-ar-pair-tracking/default.nix +++ b/melodic/yocs-ar-pair-tracking/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "60179e49a3644effdd14bf503e183c3ef7c0690f550b89e64847399f3934c7df"; }; - buildInputs = [ ar-track-alvar-msgs yocs-ar-marker-tracking std-msgs sensor-msgs roscpp yocs-math-toolkit yocs-msgs geometry-msgs ]; - propagatedBuildInputs = [ ar-track-alvar-msgs yocs-ar-marker-tracking std-msgs sensor-msgs roscpp yocs-math-toolkit yocs-msgs geometry-msgs ]; + buildInputs = [ sensor-msgs yocs-math-toolkit yocs-msgs ar-track-alvar-msgs yocs-ar-marker-tracking std-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs yocs-math-toolkit yocs-msgs ar-track-alvar-msgs yocs-ar-marker-tracking std-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''The AR pair tracking package''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-cmd-vel-mux/default.nix b/melodic/yocs-cmd-vel-mux/default.nix index bc1059f08d..7e2798f6ad 100644 --- a/melodic/yocs-cmd-vel-mux/default.nix +++ b/melodic/yocs-cmd-vel-mux/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "fb7a0444d33e684e14c5c1b78fa3c2cda433abbd202401316232daff02af5791"; }; - buildInputs = [ pluginlib dynamic-reconfigure libyamlcpp geometry-msgs nodelet roscpp ]; - propagatedBuildInputs = [ pluginlib dynamic-reconfigure libyamlcpp geometry-msgs nodelet roscpp ]; + buildInputs = [ pluginlib libyamlcpp roscpp dynamic-reconfigure nodelet geometry-msgs ]; + propagatedBuildInputs = [ pluginlib libyamlcpp roscpp dynamic-reconfigure nodelet geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { @@ -21,6 +21,6 @@ buildRosPackage { allowing one topic at a time to command the robot, based on priorities. It also deallocates current allowed topic if no messages are received after a configured timeout. All topics, together with their priority and timeout are configured through a YAML file, that can be reload at runtime.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-controllers/default.nix b/melodic/yocs-controllers/default.nix index c7b2f24e59..c764690395 100644 --- a/melodic/yocs-controllers/default.nix +++ b/melodic/yocs-controllers/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Library for various controller types and algorithms''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-diff-drive-pose-controller/default.nix b/melodic/yocs-diff-drive-pose-controller/default.nix index 271155d126..5a3620e2d4 100644 --- a/melodic/yocs-diff-drive-pose-controller/default.nix +++ b/melodic/yocs-diff-drive-pose-controller/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''A controller for driving a differential drive base to a pose goal or along a path specified by multiple poses. A pose consists of a 2D position (x,y) and a 1D orientation (theta).''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-joyop/default.nix b/melodic/yocs-joyop/default.nix index 7492550bba..c14a460fdb 100644 --- a/melodic/yocs-joyop/default.nix +++ b/melodic/yocs-joyop/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "e44414b71e3e378a83012afa9219ae787162895a4bab5bf7353528d07cc24ab7"; }; - buildInputs = [ ecl-exceptions std-msgs sensor-msgs roscpp yocs-msgs geometry-msgs ecl-time ]; - propagatedBuildInputs = [ ecl-exceptions geometry-msgs std-msgs sensor-msgs joy yocs-msgs roscpp ecl-time ]; + buildInputs = [ sensor-msgs yocs-msgs ecl-time ecl-exceptions std-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ sensor-msgs joy yocs-msgs ecl-time ecl-exceptions std-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Joystick teleoperation for your robot robot core''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-keyop/default.nix b/melodic/yocs-keyop/default.nix index 77d03b039f..424532a7ca 100644 --- a/melodic/yocs-keyop/default.nix +++ b/melodic/yocs-keyop/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "9b6de8d0572c1d3c31cca79bf6ad19f484cc7f0bbb4c6af27012f6eaf010f26d"; }; - buildInputs = [ ecl-exceptions ecl-threads std-msgs roscpp geometry-msgs ecl-time ]; - propagatedBuildInputs = [ ecl-exceptions ecl-threads std-msgs roscpp geometry-msgs ecl-time ]; + buildInputs = [ ecl-time ecl-exceptions ecl-threads std-msgs roscpp geometry-msgs ]; + propagatedBuildInputs = [ ecl-time ecl-exceptions ecl-threads std-msgs roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Keyboard teleoperation for your robot''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-localization-manager/default.nix b/melodic/yocs-localization-manager/default.nix index a03a2f4e39..df034929b3 100644 --- a/melodic/yocs-localization-manager/default.nix +++ b/melodic/yocs-localization-manager/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, roslint, ar-track-alvar, catkin, yocs-msgs, ar-track-alvar-msgs, std-msgs, actionlib, rospy, dynamic-reconfigure, tf, geometry-msgs }: +{ lib, buildRosPackage, fetchurl, roslint, ar-track-alvar, catkin, yocs-msgs, ar-track-alvar-msgs, rospy, actionlib, std-msgs, dynamic-reconfigure, tf, geometry-msgs }: buildRosPackage { pname = "ros-melodic-yocs-localization-manager"; version = "0.8.2"; @@ -13,11 +13,11 @@ buildRosPackage { }; buildInputs = [ roslint ]; - propagatedBuildInputs = [ ar-track-alvar yocs-msgs ar-track-alvar-msgs rospy actionlib std-msgs dynamic-reconfigure tf geometry-msgs ]; + propagatedBuildInputs = [ ar-track-alvar yocs-msgs ar-track-alvar-msgs actionlib rospy std-msgs dynamic-reconfigure tf geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Localization Manager helps to localize robot's position with annotated information''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-math-toolkit/default.nix b/melodic/yocs-math-toolkit/default.nix index 0e3daa6df6..9b6d4aa9fe 100644 --- a/melodic/yocs-math-toolkit/default.nix +++ b/melodic/yocs-math-toolkit/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ecl-formatters, geometry-msgs, catkin, roscpp, ecl-build, ecl-exceptions, ecl-linear-algebra, tf, ecl-config }: +{ lib, buildRosPackage, fetchurl, ecl-formatters, tf, catkin, ecl-config, ecl-build, ecl-exceptions, ecl-linear-algebra, roscpp, geometry-msgs }: buildRosPackage { pname = "ros-melodic-yocs-math-toolkit"; version = "0.8.2"; @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "53550a80b4e50074b5c5b15fe44f2d4e463ff9f768e6e662b7a7b3d65f2c32fd"; }; - buildInputs = [ ecl-exceptions ecl-formatters roscpp ecl-linear-algebra geometry-msgs tf ecl-config ecl-build ]; - propagatedBuildInputs = [ ecl-exceptions ecl-formatters roscpp ecl-linear-algebra geometry-msgs tf ecl-config ecl-build ]; + buildInputs = [ ecl-formatters geometry-msgs roscpp ecl-build ecl-exceptions ecl-linear-algebra tf ecl-config ]; + propagatedBuildInputs = [ ecl-formatters geometry-msgs roscpp ecl-build ecl-exceptions ecl-linear-algebra tf ecl-config ]; nativeBuildInputs = [ catkin ]; meta = { @@ -21,6 +21,6 @@ buildRosPackage { mostly for simple mathematics but also for tf-related conversions. By no means it pretends to be an efficient and robust, widely used math library, but a play ground where to put common code that is typically repeated in many robot control programs.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-msgs/default.nix b/melodic/yocs-msgs/default.nix index b89eceddba..b9400818f2 100644 --- a/melodic/yocs-msgs/default.nix +++ b/melodic/yocs-msgs/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "92aa5df09147dc1819de1d4415efe58d267744ca6cbf9ffe4dbb742d1713cdcc"; }; - buildInputs = [ std-srvs message-generation actionlib-msgs dynamic-reconfigure std-msgs geometry-msgs ]; - propagatedBuildInputs = [ std-srvs message-runtime actionlib-msgs dynamic-reconfigure std-msgs geometry-msgs ]; + buildInputs = [ std-srvs actionlib-msgs message-generation dynamic-reconfigure std-msgs geometry-msgs ]; + propagatedBuildInputs = [ std-srvs actionlib-msgs message-runtime dynamic-reconfigure std-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Yujin's Open Control System messages, services and actions''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-navi-toolkit/default.nix b/melodic/yocs-navi-toolkit/default.nix index 0cc2d12810..b617cfff34 100644 --- a/melodic/yocs-navi-toolkit/default.nix +++ b/melodic/yocs-navi-toolkit/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "fbf635ac9b081ac52ced067b1d5b6ffdb7c17a320ba7d229e92d53538a44ac5f"; }; - buildInputs = [ costmap-2d nav-msgs base-local-planner ecl-linear-algebra tf roscpp ecl-build ]; - propagatedBuildInputs = [ costmap-2d nav-msgs base-local-planner ecl-linear-algebra tf roscpp ecl-build ]; + buildInputs = [ costmap-2d base-local-planner tf ecl-build nav-msgs ecl-linear-algebra roscpp ]; + propagatedBuildInputs = [ costmap-2d base-local-planner tf ecl-build nav-msgs ecl-linear-algebra roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Ros navigation utilities.''; - #license = lib.licenses.Yujin Robot; + license = with lib.licenses; [ "Yujin Robot" ]; }; } diff --git a/melodic/yocs-navigator/default.nix b/melodic/yocs-navigator/default.nix index 3abf200c56..9c21d12926 100644 --- a/melodic/yocs-navigator/default.nix +++ b/melodic/yocs-navigator/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, tf, catkin, yocs-math-toolkit, yocs-msgs, move-base-msgs, nav-msgs, actionlib, rospy, roscpp }: +{ lib, buildRosPackage, fetchurl, catkin, yocs-math-toolkit, yocs-msgs, roscpp, move-base-msgs, nav-msgs, actionlib, rospy, tf }: buildRosPackage { pname = "ros-melodic-yocs-navigator"; version = "0.8.2"; @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "ce9cacbbb9e4456865e0c8591d0dc48d821e1823a97127deb9963bb6f3a5a75a"; }; - buildInputs = [ move-base-msgs nav-msgs actionlib rospy tf roscpp yocs-math-toolkit yocs-msgs ]; - propagatedBuildInputs = [ move-base-msgs nav-msgs actionlib rospy tf roscpp yocs-math-toolkit yocs-msgs ]; + buildInputs = [ tf yocs-math-toolkit yocs-msgs move-base-msgs nav-msgs actionlib rospy roscpp ]; + propagatedBuildInputs = [ tf yocs-math-toolkit yocs-msgs move-base-msgs nav-msgs actionlib rospy roscpp ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Navigation module for robots''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-rapps/default.nix b/melodic/yocs-rapps/default.nix index 432ff28278..33d449c58e 100644 --- a/melodic/yocs-rapps/default.nix +++ b/melodic/yocs-rapps/default.nix @@ -17,6 +17,6 @@ buildRosPackage { meta = { description = ''Yujin open control system rapps for use with the app manager and rocon concert''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-safety-controller/default.nix b/melodic/yocs-safety-controller/default.nix index 3868107d2f..a1b3f20ee7 100644 --- a/melodic/yocs-safety-controller/default.nix +++ b/melodic/yocs-safety-controller/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, pluginlib, sensor-msgs, catkin, ecl-threads, nodelet, std-msgs, roscpp, geometry-msgs, yocs-controllers }: +{ lib, buildRosPackage, fetchurl, pluginlib, sensor-msgs, catkin, roscpp, ecl-threads, std-msgs, nodelet, geometry-msgs, yocs-controllers }: buildRosPackage { pname = "ros-melodic-yocs-safety-controller"; version = "0.8.2"; @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "83f0799143de08c0f6c8aa93c665fbac01d8a7dc3e8e04752bdc59e042244557"; }; - buildInputs = [ pluginlib nodelet geometry-msgs std-msgs sensor-msgs roscpp yocs-controllers ecl-threads ]; - propagatedBuildInputs = [ pluginlib nodelet geometry-msgs std-msgs sensor-msgs roscpp yocs-controllers ecl-threads ]; + buildInputs = [ pluginlib sensor-msgs ecl-threads nodelet std-msgs roscpp geometry-msgs yocs-controllers ]; + propagatedBuildInputs = [ pluginlib sensor-msgs ecl-threads nodelet std-msgs roscpp geometry-msgs yocs-controllers ]; nativeBuildInputs = [ catkin ]; meta = { @@ -22,6 +22,6 @@ buildRosPackage { The SafetyController listens to ranger readings in order to stop (and move back), if obstacles get to close. This controller can be enabled/disabled.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-velocity-smoother/default.nix b/melodic/yocs-velocity-smoother/default.nix index 3aba518291..a7043deb14 100644 --- a/melodic/yocs-velocity-smoother/default.nix +++ b/melodic/yocs-velocity-smoother/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "9de916242e06317201e15ac26eb33949b8f7aeb84dc262ee44e82ce5ceb3328a"; }; - buildInputs = [ nav-msgs pluginlib dynamic-reconfigure geometry-msgs nodelet roscpp ecl-threads ]; - propagatedBuildInputs = [ nav-msgs pluginlib dynamic-reconfigure geometry-msgs nodelet roscpp ecl-threads ]; + buildInputs = [ pluginlib roscpp ecl-threads nav-msgs dynamic-reconfigure nodelet geometry-msgs ]; + propagatedBuildInputs = [ pluginlib roscpp ecl-threads nav-msgs dynamic-reconfigure nodelet geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Bound incoming velocity messages according to robot velocity and acceleration limits.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-virtual-sensor/default.nix b/melodic/yocs-virtual-sensor/default.nix index 12ec3d8d5d..ced048d4df 100644 --- a/melodic/yocs-virtual-sensor/default.nix +++ b/melodic/yocs-virtual-sensor/default.nix @@ -12,8 +12,8 @@ buildRosPackage { sha256 = "4505ba05080e444b2000591f1628a4e204e1efb9e9e45be6a8ccb19506193631"; }; - buildInputs = [ tf sensor-msgs roscpp yocs-math-toolkit yocs-msgs geometry-msgs ]; - propagatedBuildInputs = [ tf sensor-msgs yocs-math-toolkit yocs-msgs roscpp rospy-message-converter rospy visualization-msgs geometry-msgs ]; + buildInputs = [ sensor-msgs yocs-math-toolkit yocs-msgs roscpp tf geometry-msgs ]; + propagatedBuildInputs = [ tf sensor-msgs yocs-math-toolkit yocs-msgs rospy-message-converter visualization-msgs rospy roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { @@ -21,6 +21,6 @@ buildRosPackage { Current implementation cannot read obstacles from YAML files. Until this feature gets implemented, we use auxiliary scripts to read and publish files' content. Data directory contains some example files.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-waypoint-provider/default.nix b/melodic/yocs-waypoint-provider/default.nix index 10eacff1b6..0a127e3f1d 100644 --- a/melodic/yocs-waypoint-provider/default.nix +++ b/melodic/yocs-waypoint-provider/default.nix @@ -12,12 +12,12 @@ buildRosPackage { sha256 = "af1f87405e022fbc50096287d8b679f0198b09307dc22b04aa1b8a3bcfc4f9f3"; }; - buildInputs = [ geometry-msgs libyamlcpp visualization-msgs yocs-msgs roscpp ]; - propagatedBuildInputs = [ geometry-msgs libyamlcpp visualization-msgs yocs-msgs roscpp ]; + buildInputs = [ libyamlcpp yocs-msgs roscpp visualization-msgs geometry-msgs ]; + propagatedBuildInputs = [ libyamlcpp yocs-msgs roscpp visualization-msgs geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Parse a multiple poses from yaml and provide as topic and service. This package is highly inspired by yocs_waypoints_navi''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/yocs-waypoints-navi/default.nix b/melodic/yocs-waypoints-navi/default.nix index 71ad1dc79c..ca6da76cd7 100644 --- a/melodic/yocs-waypoints-navi/default.nix +++ b/melodic/yocs-waypoints-navi/default.nix @@ -12,14 +12,14 @@ buildRosPackage { sha256 = "b0134c5b12ed2067775780964a54a4d339efc42bcb4481b013913c93550f0e96"; }; - buildInputs = [ actionlib-msgs tf yocs-math-toolkit yocs-msgs roscpp move-base-msgs nav-msgs actionlib visualization-msgs geometry-msgs ]; - propagatedBuildInputs = [ actionlib-msgs tf yocs-math-toolkit yocs-msgs roscpp move-base-msgs nav-msgs actionlib visualization-msgs geometry-msgs ]; + buildInputs = [ actionlib-msgs tf yocs-math-toolkit yocs-msgs move-base-msgs nav-msgs visualization-msgs actionlib roscpp geometry-msgs ]; + propagatedBuildInputs = [ actionlib-msgs tf yocs-math-toolkit yocs-msgs move-base-msgs nav-msgs visualization-msgs actionlib roscpp geometry-msgs ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Simple tool for waypoints navigation with two functions:
    * Command the robot to go to a goal by passing through a series of waypoints.
    * Command the robot to constantly loop through a series of waypoints, useful for patrol.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ypspur-ros/default.nix b/melodic/ypspur-ros/default.nix index 44d9ff3806..f452d8c44b 100644 --- a/melodic/ypspur-ros/default.nix +++ b/melodic/ypspur-ros/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''ROS wrapper for the mobile robot control platform YP-Spur''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/ypspur/default.nix b/melodic/ypspur/default.nix index e7c882dc30..53a9251ebc 100644 --- a/melodic/ypspur/default.nix +++ b/melodic/ypspur/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''YP-Spur is a mobile robot motion control software with coordinate frame based commands.''; - #license = lib.licenses.MIT; + license = with lib.licenses; [ mit ]; }; } diff --git a/melodic/yujin-ocs/default.nix b/melodic/yujin-ocs/default.nix index eb93f3574a..4812670bc1 100644 --- a/melodic/yujin-ocs/default.nix +++ b/melodic/yujin-ocs/default.nix @@ -2,7 +2,7 @@ # Copyright 2019 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, yocs-diff-drive-pose-controller, yocs-keyop, catkin, yocs-math-toolkit, yocs-waypoints-navi, yocs-velocity-smoother, yocs-virtual-sensor, yocs-safety-controller, yocs-rapps, yocs-joyop, yocs-cmd-vel-mux, yocs-controllers }: +{ lib, buildRosPackage, fetchurl, yocs-diff-drive-pose-controller, yocs-keyop, catkin, yocs-math-toolkit, yocs-velocity-smoother, yocs-waypoints-navi, yocs-virtual-sensor, yocs-safety-controller, yocs-rapps, yocs-joyop, yocs-cmd-vel-mux, yocs-controllers }: buildRosPackage { pname = "ros-melodic-yujin-ocs"; version = "0.8.2"; @@ -12,11 +12,11 @@ buildRosPackage { sha256 = "fda374e1eaa08d31770f20eb374a2f781cf7a284403323c7d197f31428d9b1e5"; }; - propagatedBuildInputs = [ yocs-diff-drive-pose-controller yocs-keyop yocs-math-toolkit yocs-waypoints-navi yocs-velocity-smoother yocs-virtual-sensor yocs-safety-controller yocs-rapps yocs-joyop yocs-cmd-vel-mux yocs-controllers ]; + propagatedBuildInputs = [ yocs-diff-drive-pose-controller yocs-keyop yocs-math-toolkit yocs-velocity-smoother yocs-waypoints-navi yocs-virtual-sensor yocs-safety-controller yocs-rapps yocs-joyop yocs-cmd-vel-mux yocs-controllers ]; nativeBuildInputs = [ catkin ]; meta = { description = ''Yujin Robot's open-source control software''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/melodic/zeroconf-msgs/default.nix b/melodic/zeroconf-msgs/default.nix index a2c11bb41e..5ee899f131 100644 --- a/melodic/zeroconf-msgs/default.nix +++ b/melodic/zeroconf-msgs/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''General ros communications used by the various zeroconf implementations.''; - #license = lib.licenses.BSD; + license = with lib.licenses; [ bsdOriginal ]; }; }