diff --git a/distros/foxy/acado-vendor/default.nix b/distros/foxy/acado-vendor/default.nix new file mode 100644 index 0000000000..9a2e27ff47 --- /dev/null +++ b/distros/foxy/acado-vendor/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-lint-cmake, ament-cmake-xmllint, ament-lint-auto }: +buildRosPackage { + pname = "ros-foxy-acado-vendor"; + version = "1.0.0-r2"; + + src = fetchurl { + url = "https://gitlab.com/autowarefoundation/autoware.auto/acado_vendor-release/-/archive/release/foxy/acado_vendor/1.0.0-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "58962a744baeaa154e3c11b16ce3daface6b67600d813d458c8150bf7e01b06e"; + }; + + buildType = "ament_cmake"; + checkInputs = [ ament-cmake-lint-cmake ament-cmake-xmllint ament-lint-auto ]; + nativeBuildInputs = [ ament-cmake ]; + + meta = { + description = ''ament package for ACADO toolkit for MPC code generation''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/foxy/ament-nodl/default.nix b/distros/foxy/ament-nodl/default.nix index 4798b283f1..badeded75f 100644 --- a/distros/foxy/ament-nodl/default.nix +++ b/distros/foxy/ament-nodl/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Ament extension for exporting NoDL .xml files''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/foxy/apex-containers/default.nix b/distros/foxy/apex-containers/default.nix index 611d9edfa7..cea17638b0 100644 --- a/distros/foxy/apex-containers/default.nix +++ b/distros/foxy/apex-containers/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.0.3-r1"; src = fetchurl { - url = "https://gitlab.com/ApexAI/apex_containers-release/-/archive/release/foxy/apex_containers/0.0.3-1/apex_containers-release-release-foxy-apex_containers-0.0.3-1.tar.gz"; - name = "apex_containers-release-release-foxy-apex_containers-0.0.3-1.tar.gz"; - sha256 = "4770a7df0dd7e9026017d7b491aef0a7edcaeaf62ebfb84fc461a40bc88e3560"; + url = "https://gitlab.com/ApexAI/apex_containers-release/-/archive/release/foxy/apex_containers/0.0.3-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "32ed55b4adff00c9f65f3ab34c1cfaea899ade1d73963b41edeb33a2dee445aa"; }; buildType = "ament_cmake"; diff --git a/distros/foxy/apex-test-tools/default.nix b/distros/foxy/apex-test-tools/default.nix index 5432a58f78..dec8c01214 100644 --- a/distros/foxy/apex-test-tools/default.nix +++ b/distros/foxy/apex-test-tools/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.0.2-r1"; src = fetchurl { - url = "https://gitlab.com/ApexAI/apex_test_tools-release/-/archive/release/foxy/apex_test_tools/0.0.2-1/apex_test_tools-release-release-foxy-apex_test_tools-0.0.2-1.tar.gz"; - name = "apex_test_tools-release-release-foxy-apex_test_tools-0.0.2-1.tar.gz"; - sha256 = "5397b4f6725e6f7a8ade5832dd802bbe9b9506fa69f2ab7402c6ebb840c3a260"; + url = "https://gitlab.com/ApexAI/apex_test_tools-release/-/archive/release/foxy/apex_test_tools/0.0.2-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "892bad4ede47e5e159b2d8ced4a6381f116176ecc5469783003c5cdf350ed661"; }; buildType = "ament_cmake"; diff --git a/distros/foxy/apriltag/default.nix b/distros/foxy/apriltag/default.nix index 2f10d479f0..0a55e48603 100644 --- a/distros/foxy/apriltag/default.nix +++ b/distros/foxy/apriltag/default.nix @@ -2,19 +2,20 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, cmake, python3Packages }: +{ lib, buildRosPackage, fetchurl, cmake, opencv3, python3Packages }: buildRosPackage { pname = "ros-foxy-apriltag"; - version = "3.1.5-r1"; + version = "3.2.0-r1"; src = fetchurl { - url = "https://github.com/AprilRobotics/apriltag-release/archive/release/foxy/apriltag/3.1.5-1.tar.gz"; - name = "3.1.5-1.tar.gz"; - sha256 = "c7bb3aed55dda58ce94a3749aeaa59938ba15150bd9e9438f1004a0305185d40"; + url = "https://github.com/AprilRobotics/apriltag-release/archive/release/foxy/apriltag/3.2.0-1.tar.gz"; + name = "3.2.0-1.tar.gz"; + sha256 = "3eab780272240f80deebb5440587ea9958a1bff60356f11de9c972d9dd6905b7"; }; buildType = "cmake"; buildInputs = [ python3Packages.numpy ]; + checkInputs = [ opencv3 ]; nativeBuildInputs = [ cmake ]; meta = { diff --git a/distros/foxy/astuff-sensor-msgs/default.nix b/distros/foxy/astuff-sensor-msgs/default.nix index ebc306c0b4..e2de88ae1f 100644 --- a/distros/foxy/astuff-sensor-msgs/default.nix +++ b/distros/foxy/astuff-sensor-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "258c5f14af862f6c85ca8573cfcbcd9edfa67b502f94ce97f84cd6fa28d4ab3a"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment ]; propagatedBuildInputs = [ delphi-esr-msgs delphi-srr-msgs derived-object-msgs ibeo-msgs kartech-linear-actuator-msgs mobileye-560-660-msgs neobotix-usboard-msgs pacmod-msgs ]; nativeBuildInputs = [ ament-cmake ]; diff --git a/distros/foxy/automotive-autonomy-msgs/default.nix b/distros/foxy/automotive-autonomy-msgs/default.nix index 982538af62..4781047a72 100644 --- a/distros/foxy/automotive-autonomy-msgs/default.nix +++ b/distros/foxy/automotive-autonomy-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "85ccd955cbadc897374c94ea50e08eecb1aa5562d37fb8a90fa18001ab832a3b"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment ]; propagatedBuildInputs = [ automotive-navigation-msgs automotive-platform-msgs ]; nativeBuildInputs = [ ament-cmake ]; diff --git a/distros/foxy/automotive-navigation-msgs/default.nix b/distros/foxy/automotive-navigation-msgs/default.nix index 5b6ebca771..cae5988283 100644 --- a/distros/foxy/automotive-navigation-msgs/default.nix +++ b/distros/foxy/automotive-navigation-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "612eebd72c82191bf2cdcab245485cc65b728806be9cc7f13cdfafb273ad90ad"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces geometry-msgs rosidl-default-runtime std-msgs ]; diff --git a/distros/foxy/automotive-platform-msgs/default.nix b/distros/foxy/automotive-platform-msgs/default.nix index b17b779679..bb6aabd4f2 100644 --- a/distros/foxy/automotive-platform-msgs/default.nix +++ b/distros/foxy/automotive-platform-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "4bc6a91b23bc8eca2931cd43c975b4a3b1b5cc672e99b8e51754d244ba1b5e7b"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime std-msgs ]; diff --git a/distros/foxy/autoware-auto-msgs/default.nix b/distros/foxy/autoware-auto-msgs/default.nix new file mode 100644 index 0000000000..379decce7f --- /dev/null +++ b/distros/foxy/autoware-auto-msgs/default.nix @@ -0,0 +1,26 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, action-msgs, ament-cmake-auto, ament-lint-auto, ament-lint-common, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, sensor-msgs, std-msgs }: +buildRosPackage { + pname = "ros-foxy-autoware-auto-msgs"; + version = "1.0.0-r1"; + + src = fetchurl { + url = "https://gitlab.com/autowarefoundation/autoware.auto/autoware_auto_msgs-release/-/archive/release/foxy/autoware_auto_msgs/1.0.0-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "0ffd2d0d97fcd3d6d9536f11c0b836bc2aadcacd3e4fa388c00cd19aee7fa429"; + }; + + buildType = "ament_cmake"; + buildInputs = [ rosidl-default-generators ]; + checkInputs = [ ament-lint-auto ament-lint-common ]; + propagatedBuildInputs = [ action-msgs geometry-msgs rosidl-default-runtime sensor-msgs std-msgs ]; + nativeBuildInputs = [ ament-cmake-auto ]; + + meta = { + description = ''Interfaces between core Autoware.Auto components''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/foxy/aws-robomaker-small-warehouse-world/default.nix b/distros/foxy/aws-robomaker-small-warehouse-world/default.nix index 720b3ccf3d..cbe8635087 100644 --- a/distros/foxy/aws-robomaker-small-warehouse-world/default.nix +++ b/distros/foxy/aws-robomaker-small-warehouse-world/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''AWS RoboMaker package for a warehouse world to use in manufacturing and logistics robot applications.''; - license = with lib.licenses; [ mit ]; + license = with lib.licenses; [ "MIT-0" ]; }; } diff --git a/distros/foxy/behaviortree-cpp-v3/default.nix b/distros/foxy/behaviortree-cpp-v3/default.nix index dfbfdaf47b..64f3110555 100644 --- a/distros/foxy/behaviortree-cpp-v3/default.nix +++ b/distros/foxy/behaviortree-cpp-v3/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "1650215dfeff9009bb656a5554d379673c51167e50d1ba630e4a107bd16f1ec3"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ ament-cmake-gtest ]; propagatedBuildInputs = [ ament-index-cpp boost cppzmq ncurses rclcpp ]; nativeBuildInputs = [ ament-cmake ]; diff --git a/distros/foxy/carla-msgs/default.nix b/distros/foxy/carla-msgs/default.nix index fbd9a30b37..8b247ecebf 100644 --- a/distros/foxy/carla-msgs/default.nix +++ b/distros/foxy/carla-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "7ac2b7863a08277506c55af3df35054cb441623002173e5b619155e44d05d97c"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces diagnostic-msgs geometry-msgs rosidl-default-runtime std-msgs ]; diff --git a/distros/foxy/costmap-queue/default.nix b/distros/foxy/costmap-queue/default.nix index c67aa8efa0..69a36cfe7b 100644 --- a/distros/foxy/costmap-queue/default.nix +++ b/distros/foxy/costmap-queue/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''The costmap_queue package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/cyclonedds/default.nix b/distros/foxy/cyclonedds/default.nix index 1768eee14e..9546a42b55 100644 --- a/distros/foxy/cyclonedds/default.nix +++ b/distros/foxy/cyclonedds/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Eclipse Cyclone DDS is a very performant and robust open-source DDS implementation. Cyclone DDS is developed completely in the open as an Eclipse IoT project.''; - license = with lib.licenses; [ "Eclipse Public License 2.0" "Eclipse Distribution License 1.0" ]; + license = with lib.licenses; [ "EPL-2.0" "Eclipse-Distribution-License-1.0" ]; }; } diff --git a/distros/foxy/delphi-esr-msgs/default.nix b/distros/foxy/delphi-esr-msgs/default.nix index 48e3a89b8d..2b95a154f1 100644 --- a/distros/foxy/delphi-esr-msgs/default.nix +++ b/distros/foxy/delphi-esr-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "e0f142f60047d2773945b43c1abf273da68618d0aa36b9e7fd445e3a2b99ed4a"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime std-msgs ]; diff --git a/distros/foxy/delphi-mrr-msgs/default.nix b/distros/foxy/delphi-mrr-msgs/default.nix index d9a279610f..e02faf15ee 100644 --- a/distros/foxy/delphi-mrr-msgs/default.nix +++ b/distros/foxy/delphi-mrr-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "b5394667d1ff96e8a0736138e9f59c10c887473bb8c9d769ad8b7d076f4a3bd5"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime std-msgs ]; diff --git a/distros/foxy/delphi-srr-msgs/default.nix b/distros/foxy/delphi-srr-msgs/default.nix index 2d32a8190f..161f04cd6a 100644 --- a/distros/foxy/delphi-srr-msgs/default.nix +++ b/distros/foxy/delphi-srr-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "b150a619194892976766f98d02eb1cb91ffd7fecb6405337cf5d78f838a373da"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime std-msgs ]; diff --git a/distros/foxy/derived-object-msgs/default.nix b/distros/foxy/derived-object-msgs/default.nix index bd7b8d7b40..91fd84f4b7 100644 --- a/distros/foxy/derived-object-msgs/default.nix +++ b/distros/foxy/derived-object-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "1c8368fd5e5eca6a7dafa651489bb8569bc66a68cd0e8105a7885eb7f88a18bf"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces geometry-msgs rosidl-default-runtime shape-msgs std-msgs ]; diff --git a/distros/foxy/dwb-core/default.nix b/distros/foxy/dwb-core/default.nix index 3a375fc6f4..3de2e3ffb0 100644 --- a/distros/foxy/dwb-core/default.nix +++ b/distros/foxy/dwb-core/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''TODO''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/dwb-critics/default.nix b/distros/foxy/dwb-critics/default.nix index 56269a303b..fe0ad1c34a 100644 --- a/distros/foxy/dwb-critics/default.nix +++ b/distros/foxy/dwb-critics/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''The dwb_critics package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/dwb-msgs/default.nix b/distros/foxy/dwb-msgs/default.nix index 75488214bd..43efc7ed22 100644 --- a/distros/foxy/dwb-msgs/default.nix +++ b/distros/foxy/dwb-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Message/Service definitions specifically for the dwb_core''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/dwb-plugins/default.nix b/distros/foxy/dwb-plugins/default.nix index 842f2e682f..df5c78107e 100644 --- a/distros/foxy/dwb-plugins/default.nix +++ b/distros/foxy/dwb-plugins/default.nix @@ -22,6 +22,6 @@ buildRosPackage { meta = { description = ''Standard implementations of the GoalChecker and TrajectoryGenerators for dwb_core''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/eiquadprog/default.nix b/distros/foxy/eiquadprog/default.nix index 203c9daa4f..f036e74457 100644 --- a/distros/foxy/eiquadprog/default.nix +++ b/distros/foxy/eiquadprog/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Eiquadprog a QP solver using active sets''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/foxy/espeak-interfaces/default.nix b/distros/foxy/espeak-interfaces/default.nix index 4ebc39eac6..d3e61c3a89 100644 --- a/distros/foxy/espeak-interfaces/default.nix +++ b/distros/foxy/espeak-interfaces/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "1.0.0-r1"; src = fetchurl { - url = "https://gitlab.com/espeak-ros2/espeak-ros2-release/-/archive/release/foxy/espeak_interfaces/1.0.0-1/espeak-ros2-release-release-foxy-espeak_interfaces-1.0.0-1.tar.gz"; - name = "espeak-ros2-release-release-foxy-espeak_interfaces-1.0.0-1.tar.gz"; - sha256 = "9fac62992b1ae3f6de3aded1216811a042f6a0389e8764fc8666bb8a9248e3fb"; + url = "https://gitlab.com/espeak-ros2/espeak-ros2-release/-/archive/release/foxy/espeak_interfaces/1.0.0-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "946b044e2311581d5f544fd31566154f17ae0bf36c41c41a2e020b91e957ea2a"; }; buildType = "ament_cmake"; diff --git a/distros/foxy/espeak-ros/default.nix b/distros/foxy/espeak-ros/default.nix index c35fa8d7c2..5255c08a49 100644 --- a/distros/foxy/espeak-ros/default.nix +++ b/distros/foxy/espeak-ros/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "1.0.0-r1"; src = fetchurl { - url = "https://gitlab.com/espeak-ros2/espeak-ros2-release/-/archive/release/foxy/espeak_ros/1.0.0-1/espeak-ros2-release-release-foxy-espeak_ros-1.0.0-1.tar.gz"; - name = "espeak-ros2-release-release-foxy-espeak_ros-1.0.0-1.tar.gz"; - sha256 = "bbefb7e80bc3dbdfbf467050cabd658a12ca4a8216fb9122e2785e68960a8e6e"; + url = "https://gitlab.com/espeak-ros2/espeak-ros2-release/-/archive/release/foxy/espeak_ros/1.0.0-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "0fcfc70a61735971c858a4ed23dfeb920c1db630f0228556f11816c7124603e5"; }; buildType = "ament_python"; diff --git a/distros/foxy/fmilibrary-vendor/default.nix b/distros/foxy/fmilibrary-vendor/default.nix index 8396f2180b..61065f9a9e 100644 --- a/distros/foxy/fmilibrary-vendor/default.nix +++ b/distros/foxy/fmilibrary-vendor/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Wrapper (aka vendor package) around the FMILibrary by Modelon AB (JModelica.org)''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/foonathan-memory-vendor/default.nix b/distros/foxy/foonathan-memory-vendor/default.nix index fbca33a5e3..a5d0389832 100644 --- a/distros/foxy/foonathan-memory-vendor/default.nix +++ b/distros/foxy/foonathan-memory-vendor/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Foonathan/memory vendor package for Fast-RTPS.''; - license = with lib.licenses; [ asl20 "zlib License" ]; + license = with lib.licenses; [ asl20 "Zlib" ]; }; } diff --git a/distros/foxy/gazebo-plugins/default.nix b/distros/foxy/gazebo-plugins/default.nix index f1d6786232..f5cec8444e 100644 --- a/distros/foxy/gazebo-plugins/default.nix +++ b/distros/foxy/gazebo-plugins/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components.''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-&-Apache-2.0" ]; }; } diff --git a/distros/foxy/gazebo-ros-pkgs/default.nix b/distros/foxy/gazebo-ros-pkgs/default.nix index cfd3893314..ccc1a39ba5 100644 --- a/distros/foxy/gazebo-ros-pkgs/default.nix +++ b/distros/foxy/gazebo-ros-pkgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Interface for using ROS with the Gazebo simulator.''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-&-LGPL-&-Apache-2.0" ]; }; } diff --git a/distros/foxy/generated.nix b/distros/foxy/generated.nix index 2d592d3bf2..513c017f55 100644 --- a/distros/foxy/generated.nix +++ b/distros/foxy/generated.nix @@ -4,6 +4,8 @@ self: super: { + acado-vendor = self.callPackage ./acado-vendor {}; + ackermann-msgs = self.callPackage ./ackermann-msgs {}; action-msgs = self.callPackage ./action-msgs {}; @@ -150,6 +152,8 @@ self: super: { automotive-platform-msgs = self.callPackage ./automotive-platform-msgs {}; + autoware-auto-msgs = self.callPackage ./autoware-auto-msgs {}; + avt-vimba-camera = self.callPackage ./avt-vimba-camera {}; aws-robomaker-small-warehouse-world = self.callPackage ./aws-robomaker-small-warehouse-world {}; @@ -954,6 +958,8 @@ self: super: { pacmod-msgs = self.callPackage ./pacmod-msgs {}; + paho-mqtt-c = self.callPackage ./paho-mqtt-c {}; + pal-gazebo-worlds = self.callPackage ./pal-gazebo-worlds {}; pal-statistics = self.callPackage ./pal-statistics {}; @@ -1148,6 +1154,8 @@ self: super: { rclc-lifecycle = self.callPackage ./rclc-lifecycle {}; + rclc-parameter = self.callPackage ./rclc-parameter {}; + rclcpp = self.callPackage ./rclcpp {}; rclcpp-action = self.callPackage ./rclcpp-action {}; diff --git a/distros/foxy/grepros/default.nix b/distros/foxy/grepros/default.nix index 764b9add53..cf6c2e4787 100644 --- a/distros/foxy/grepros/default.nix +++ b/distros/foxy/grepros/default.nix @@ -2,20 +2,20 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake-pytest, builtin-interfaces, python3Packages, pythonPackages, rclpy, rosidl-runtime-py, std-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake-pytest, builtin-interfaces, python3Packages, pythonPackages, rclpy, rosidl-parser, rosidl-runtime-py, std-msgs }: buildRosPackage { pname = "ros-foxy-grepros"; - version = "0.4.0-r1"; + version = "0.4.4-r1"; src = fetchurl { - url = "https://github.com/suurjaak/grepros-release/archive/release/foxy/grepros/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "698f47b1e3da4fd7a892b4ca2eecbb8aeb326092f5e2a8e744ed5420df471f9b"; + url = "https://github.com/suurjaak/grepros-release/archive/release/foxy/grepros/0.4.4-1.tar.gz"; + name = "0.4.4-1.tar.gz"; + sha256 = "fee5e4face7dbfba341b71f0e54d0216be6c2ae33615c36fc368251f38327cb4"; }; - buildType = "catkin"; + buildType = "ament_python"; checkInputs = [ ament-cmake-pytest pythonPackages.pytest std-msgs ]; - propagatedBuildInputs = [ builtin-interfaces python3Packages.pyyaml rclpy rosidl-runtime-py ]; + propagatedBuildInputs = [ builtin-interfaces python3Packages.pyyaml rclpy rosidl-parser rosidl-runtime-py ]; meta = { description = ''grep for ROS bag files and live topics''; diff --git a/distros/foxy/gscam/default.nix b/distros/foxy/gscam/default.nix index 671f5c2564..ee652fa3ff 100644 --- a/distros/foxy/gscam/default.nix +++ b/distros/foxy/gscam/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''A ROS camera driver that uses gstreamer to connect to devices such as webcams.''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "Apache-2.0-License" ]; }; } diff --git a/distros/foxy/ibeo-msgs/default.nix b/distros/foxy/ibeo-msgs/default.nix index 94179e629a..07f8c86c12 100644 --- a/distros/foxy/ibeo-msgs/default.nix +++ b/distros/foxy/ibeo-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "dabef943871667ff41ec094c08509dd58f2447c49cc7cabe69411a301d25437e"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime std-msgs ]; diff --git a/distros/foxy/kartech-linear-actuator-msgs/default.nix b/distros/foxy/kartech-linear-actuator-msgs/default.nix index ed978a0afe..fe72210493 100644 --- a/distros/foxy/kartech-linear-actuator-msgs/default.nix +++ b/distros/foxy/kartech-linear-actuator-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "9468c167457b815de99636cab4fc1c1d82a8c20954563604458b48bec42f6901"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime std-msgs ]; diff --git a/distros/foxy/lanelet2-core/default.nix b/distros/foxy/lanelet2-core/default.nix index abc0132297..9b2462b37f 100644 --- a/distros/foxy/lanelet2-core/default.nix +++ b/distros/foxy/lanelet2-core/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "3bcea4bd78d7a3e84ffba38bda55c89b895dcae6c39e5f7d3c9dd2f9fdbcd982"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ boost eigen mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/foxy/lanelet2-examples/default.nix b/distros/foxy/lanelet2-examples/default.nix index 47cb662a6a..ceaaf648af 100644 --- a/distros/foxy/lanelet2-examples/default.nix +++ b/distros/foxy/lanelet2-examples/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "df5c02978f9781b5385519cc6511e3fa6648c604b8a21c0cbe183d9e81997f55"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ lanelet2-core lanelet2-io lanelet2-projection lanelet2-python lanelet2-routing lanelet2-traffic-rules mrt-cmake-modules ros2cli ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/foxy/lanelet2-io/default.nix b/distros/foxy/lanelet2-io/default.nix index 1af1e5236d..8f18de3764 100644 --- a/distros/foxy/lanelet2-io/default.nix +++ b/distros/foxy/lanelet2-io/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "408c1360908af9c0bd336550027a95b811f73fca34bf94f125bba5b89163b7c7"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ boost lanelet2-core mrt-cmake-modules pugixml ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/foxy/lanelet2-maps/default.nix b/distros/foxy/lanelet2-maps/default.nix index db9862c010..0a340fbf5b 100644 --- a/distros/foxy/lanelet2-maps/default.nix +++ b/distros/foxy/lanelet2-maps/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "726c2de104e44915a022a29d52f7154effaed83958d5319df5418947ac08ed8b"; }; - buildType = "catkin"; + buildType = "ament_cmake"; propagatedBuildInputs = [ lanelet2-core mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/foxy/lanelet2-projection/default.nix b/distros/foxy/lanelet2-projection/default.nix index 1dca792ffd..6dd100957a 100644 --- a/distros/foxy/lanelet2-projection/default.nix +++ b/distros/foxy/lanelet2-projection/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "7bc0f53273a52f01cd7939b11f8d7bb8537eeee16e5dc77079e33c62731f01bd"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ geographiclib lanelet2-io mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/foxy/lanelet2-python/default.nix b/distros/foxy/lanelet2-python/default.nix index c17b81ec22..2c2cc8582e 100644 --- a/distros/foxy/lanelet2-python/default.nix +++ b/distros/foxy/lanelet2-python/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "5237dcf5ed1f713d7b649a7cfccfe9ce7354f36fa8d8766c8db5b4727ecbe398"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ boost lanelet2-core lanelet2-io lanelet2-projection lanelet2-routing lanelet2-traffic-rules mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/foxy/lanelet2-routing/default.nix b/distros/foxy/lanelet2-routing/default.nix index 5f1d265d94..db40db85af 100644 --- a/distros/foxy/lanelet2-routing/default.nix +++ b/distros/foxy/lanelet2-routing/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "bd6f9c0bb160e9ba0e1ae3672a072f1e2743a8e02d1b9e2e49a8dbbc723c3864"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ boost lanelet2-core lanelet2-traffic-rules mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/foxy/lanelet2-traffic-rules/default.nix b/distros/foxy/lanelet2-traffic-rules/default.nix index 72042c69a8..3a0ca336d0 100644 --- a/distros/foxy/lanelet2-traffic-rules/default.nix +++ b/distros/foxy/lanelet2-traffic-rules/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "140a75c2da25cf7db53ecf533816122ced186ded6c08539e696a6b87e854aa64"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ lanelet2-core mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/foxy/lanelet2-validation/default.nix b/distros/foxy/lanelet2-validation/default.nix index 2382ac5b28..eca368b296 100644 --- a/distros/foxy/lanelet2-validation/default.nix +++ b/distros/foxy/lanelet2-validation/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "4b59065a9f6fc4d9ad374a37757e8260620ceacf230bef0526df715ca03c8838"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest lanelet2-maps ]; propagatedBuildInputs = [ lanelet2-core lanelet2-io lanelet2-projection lanelet2-routing lanelet2-traffic-rules mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/foxy/lanelet2/default.nix b/distros/foxy/lanelet2/default.nix index 40b780c885..0a6032599f 100644 --- a/distros/foxy/lanelet2/default.nix +++ b/distros/foxy/lanelet2/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "807cf757bea51d3ef5fdc224ee075ab75c49acc6d5e27bdaf62d10e748b881ca"; }; - buildType = "catkin"; + buildType = "ament_cmake"; propagatedBuildInputs = [ lanelet2-core lanelet2-examples lanelet2-io lanelet2-maps lanelet2-projection lanelet2-python lanelet2-routing lanelet2-traffic-rules lanelet2-validation ]; nativeBuildInputs = [ ament-cmake-core ros-environment ]; diff --git a/distros/foxy/launch-pal/default.nix b/distros/foxy/launch-pal/default.nix index 797db39b86..e31b9cc9d0 100644 --- a/distros/foxy/launch-pal/default.nix +++ b/distros/foxy/launch-pal/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Utilities for launch files''; - license = with lib.licenses; [ "Apache-1.0" ]; + license = with lib.licenses; [ "Apache" ]; }; } diff --git a/distros/foxy/lgsvl-bridge/default.nix b/distros/foxy/lgsvl-bridge/default.nix index a0462a8cf5..362b950264 100644 --- a/distros/foxy/lgsvl-bridge/default.nix +++ b/distros/foxy/lgsvl-bridge/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''LGSVL Simulator Bridge''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/lgsvl-msgs/default.nix b/distros/foxy/lgsvl-msgs/default.nix index 70e28a254f..a2ec4a9194 100644 --- a/distros/foxy/lgsvl-msgs/default.nix +++ b/distros/foxy/lgsvl-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "a23b9f1f20257200a77a0287512c25f8f174d354e938560c8e6415a19e22ec2d"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces geometry-msgs rosidl-default-runtime sensor-msgs std-msgs ]; diff --git a/distros/foxy/libmavconn/default.nix b/distros/foxy/libmavconn/default.nix index 961aff9e4f..27971a15d3 100644 --- a/distros/foxy/libmavconn/default.nix +++ b/distros/foxy/libmavconn/default.nix @@ -25,6 +25,6 @@ buildRosPackage { and URL to connection object mapper. This library can be used in standalone programs.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/foxy/libphidget22/default.nix b/distros/foxy/libphidget22/default.nix index f9dc34851a..69835ae0a2 100644 --- a/distros/foxy/libphidget22/default.nix +++ b/distros/foxy/libphidget22/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package wraps the libphidget22 to use it as a ROS dependency''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/foxy/massrobotics-amr-sender/default.nix b/distros/foxy/massrobotics-amr-sender/default.nix index 4a3ab57daf..4c6ecf1ea8 100644 --- a/distros/foxy/massrobotics-amr-sender/default.nix +++ b/distros/foxy/massrobotics-amr-sender/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''MassRobotics AMR Interop Sender''; - license = with lib.licenses; [ "3-Clause BSD License" ]; + license = with lib.licenses; [ "3-Clause-BSD-License" ]; }; } diff --git a/distros/foxy/mavlink/default.nix b/distros/foxy/mavlink/default.nix index e31f3dcfbf..00a713e70f 100644 --- a/distros/foxy/mavlink/default.nix +++ b/distros/foxy/mavlink/default.nix @@ -23,6 +23,6 @@ buildRosPackage { for both 1.0 and 2.0 versions of protocol. For pymavlink use separate install via rosdep (python-pymavlink).''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/foxy/mavros-extras/default.nix b/distros/foxy/mavros-extras/default.nix index 19dd6ab8e7..d192386d35 100644 --- a/distros/foxy/mavros-extras/default.nix +++ b/distros/foxy/mavros-extras/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Extra nodes and plugins for MAVROS.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/foxy/mavros-msgs/default.nix b/distros/foxy/mavros-msgs/default.nix index 7e2347f154..a7b6141c7f 100644 --- a/distros/foxy/mavros-msgs/default.nix +++ b/distros/foxy/mavros-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''mavros_msgs defines messages for MAVROS.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/foxy/mavros/default.nix b/distros/foxy/mavros/default.nix index d0b18e1f5e..1de9afba8e 100644 --- a/distros/foxy/mavros/default.nix +++ b/distros/foxy/mavros/default.nix @@ -22,6 +22,6 @@ buildRosPackage { meta = { description = ''MAVROS -- MAVLink extendable communication node for ROS with proxy for Ground Control Station.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/foxy/mobileye-560-660-msgs/default.nix b/distros/foxy/mobileye-560-660-msgs/default.nix index c2694f220d..6aaf90f632 100644 --- a/distros/foxy/mobileye-560-660-msgs/default.nix +++ b/distros/foxy/mobileye-560-660-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "de53cebac614b0ff1a57718ce59e3f30d08b202da6f874b3be46a577fa110a9e"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime std-msgs ]; diff --git a/distros/foxy/moveit-servo/default.nix b/distros/foxy/moveit-servo/default.nix index 830dd6e936..500fc06401 100644 --- a/distros/foxy/moveit-servo/default.nix +++ b/distros/foxy/moveit-servo/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Provides real-time manipulator Cartesian and joint servoing.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/nav-2d-msgs/default.nix b/distros/foxy/nav-2d-msgs/default.nix index 33591840a8..43b40185d1 100644 --- a/distros/foxy/nav-2d-msgs/default.nix +++ b/distros/foxy/nav-2d-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Basic message types for two dimensional navigation, extending from geometry_msgs::Pose2D.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/nav-2d-utils/default.nix b/distros/foxy/nav-2d-utils/default.nix index dfbbc1a67f..f10ad59b39 100644 --- a/distros/foxy/nav-2d-utils/default.nix +++ b/distros/foxy/nav-2d-utils/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''A handful of useful utility functions for nav_2d packages.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/nav2-amcl/default.nix b/distros/foxy/nav2-amcl/default.nix index b4124fb322..afa5ccbaed 100644 --- a/distros/foxy/nav2-amcl/default.nix +++ b/distros/foxy/nav2-amcl/default.nix @@ -30,6 +30,6 @@ buildRosPackage { This node is derived, with thanks, from Andrew Howard's excellent 'amcl' Player driver.

''; - license = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-or-later" ]; }; } diff --git a/distros/foxy/nav2-costmap-2d/default.nix b/distros/foxy/nav2-costmap-2d/default.nix index 168b18d51e..37c6ea3744 100644 --- a/distros/foxy/nav2-costmap-2d/default.nix +++ b/distros/foxy/nav2-costmap-2d/default.nix @@ -27,6 +27,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 = with lib.licenses; [ bsdOriginal asl20 ]; + license = with lib.licenses; [ "BSD-3-Clause" asl20 ]; }; } diff --git a/distros/foxy/nav2-map-server/default.nix b/distros/foxy/nav2-map-server/default.nix index 7f3b73b0bc..eba325ad1d 100644 --- a/distros/foxy/nav2-map-server/default.nix +++ b/distros/foxy/nav2-map-server/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Refactored map server for ROS2 Navigation''; - license = with lib.licenses; [ asl20 bsdOriginal ]; + license = with lib.licenses; [ asl20 "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/nav2-navfn-planner/default.nix b/distros/foxy/nav2-navfn-planner/default.nix index 43605588d2..7889e12cea 100644 --- a/distros/foxy/nav2-navfn-planner/default.nix +++ b/distros/foxy/nav2-navfn-planner/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''TODO''; - license = with lib.licenses; [ asl20 bsdOriginal ]; + license = with lib.licenses; [ asl20 "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/nav2-util/default.nix b/distros/foxy/nav2-util/default.nix index b6670bd79a..899a97d93f 100644 --- a/distros/foxy/nav2-util/default.nix +++ b/distros/foxy/nav2-util/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''TODO''; - license = with lib.licenses; [ asl20 bsdOriginal ]; + license = with lib.licenses; [ asl20 "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/nav2-voxel-grid/default.nix b/distros/foxy/nav2-voxel-grid/default.nix index f18497f260..2dad73950b 100644 --- a/distros/foxy/nav2-voxel-grid/default.nix +++ b/distros/foxy/nav2-voxel-grid/default.nix @@ -21,6 +21,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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/neobotix-usboard-msgs/default.nix b/distros/foxy/neobotix-usboard-msgs/default.nix index 995f6473dd..ab623555a6 100644 --- a/distros/foxy/neobotix-usboard-msgs/default.nix +++ b/distros/foxy/neobotix-usboard-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "7daaa6ad2392569bb26cb3c35030db44ff13477b38216d222f19f3f7e3150037"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime std-msgs ]; diff --git a/distros/foxy/nmea-hardware-interface/default.nix b/distros/foxy/nmea-hardware-interface/default.nix index dbf0662948..a90e2db2d5 100644 --- a/distros/foxy/nmea-hardware-interface/default.nix +++ b/distros/foxy/nmea-hardware-interface/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''ros2 hardware interface for nmea_gps''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "apache-2.0" ]; }; } diff --git a/distros/foxy/octovis/default.nix b/distros/foxy/octovis/default.nix index 346f8b8c9e..d69aed1e1b 100644 --- a/distros/foxy/octovis/default.nix +++ b/distros/foxy/octovis/default.nix @@ -20,6 +20,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 = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/foxy/openzen-driver/default.nix b/distros/foxy/openzen-driver/default.nix index bd8e384f65..0ffba436da 100644 --- a/distros/foxy/openzen-driver/default.nix +++ b/distros/foxy/openzen-driver/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''ROS 2 Driver for LP-Research inertial measurement units and satellite navigation senors''; - license = with lib.licenses; [ mit boost lgpl2 bsdOriginal ]; + license = with lib.licenses; [ mit "BSL-1.0" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/foxy/orocos-kdl/default.nix b/distros/foxy/orocos-kdl/default.nix index a4077633eb..d5f90dc1d7 100644 --- a/distros/foxy/orocos-kdl/default.nix +++ b/distros/foxy/orocos-kdl/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''This package contains a recent version of the Kinematics and Dynamics Library (KDL), distributed by the Orocos Project.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/foxy/pacmod-msgs/default.nix b/distros/foxy/pacmod-msgs/default.nix index 7c049457a0..4807172727 100644 --- a/distros/foxy/pacmod-msgs/default.nix +++ b/distros/foxy/pacmod-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "2339e91006ab1e3492f75d2c2b620cc5c1a99c2bf633811aa916d9093f97962b"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime std-msgs ]; diff --git a/distros/foxy/paho-mqtt-c/default.nix b/distros/foxy/paho-mqtt-c/default.nix new file mode 100644 index 0000000000..4c6db60fd5 --- /dev/null +++ b/distros/foxy/paho-mqtt-c/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, cmake, openssl }: +buildRosPackage { + pname = "ros-foxy-paho-mqtt-c"; + version = "1.3.9-r4"; + + src = fetchurl { + url = "https://github.com/nobleo/paho.mqtt.c-release/archive/release/foxy/paho-mqtt-c/1.3.9-4.tar.gz"; + name = "1.3.9-4.tar.gz"; + sha256 = "f90130ac18196616adc1a44fc5a611de0e7229714c4f4436b97cc62a45e9bb1d"; + }; + + buildType = "cmake"; + propagatedBuildInputs = [ openssl ]; + nativeBuildInputs = [ cmake ]; + + meta = { + description = ''Eclipse Paho C Client Library for the MQTT Protocol''; + license = with lib.licenses; [ "EPL-2.0" ]; + }; +} diff --git a/distros/foxy/phidgets-drivers/default.nix b/distros/foxy/phidgets-drivers/default.nix index 5f68c3619b..e36605ba60 100644 --- a/distros/foxy/phidgets-drivers/default.nix +++ b/distros/foxy/phidgets-drivers/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''API and ROS drivers for Phidgets devices''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-LGPL" ]; }; } diff --git a/distros/foxy/plotjuggler-ros/default.nix b/distros/foxy/plotjuggler-ros/default.nix index 62e6b6b33c..afdccaafc5 100644 --- a/distros/foxy/plotjuggler-ros/default.nix +++ b/distros/foxy/plotjuggler-ros/default.nix @@ -13,12 +13,12 @@ buildRosPackage { sha256 = "b9ccd0527820889123388af70c416c86717b779845ff11a7c486e3280f85974f"; }; - buildType = "catkin"; + buildType = "ament_cmake"; propagatedBuildInputs = [ binutils boost diagnostic-msgs fastcdr geometry-msgs nav-msgs plotjuggler plotjuggler-msgs qt5.qtbase qt5.qtsvg qt5.qtwebsockets rclcpp rcpputils rosbag2 rosbag2-transport sensor-msgs tf2-msgs tf2-ros ]; nativeBuildInputs = [ ament-cmake ]; meta = { description = ''PlotJuggler plugin for ROS''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "AGPLv3" ]; }; } diff --git a/distros/foxy/plotjuggler/default.nix b/distros/foxy/plotjuggler/default.nix index 311dd3c7f2..2aaa2d2dd9 100644 --- a/distros/foxy/plotjuggler/default.nix +++ b/distros/foxy/plotjuggler/default.nix @@ -13,12 +13,12 @@ buildRosPackage { sha256 = "be3ba195a60718a5080a63e34385447a84daba6f8d74c15a771652321bb6f502"; }; - buildType = "catkin"; + buildType = "ament_cmake"; propagatedBuildInputs = [ ament-index-cpp binutils boost cppzmq qt5.qtbase qt5.qtsvg qt5.qtwebsockets qt5.qtx11extras ]; nativeBuildInputs = [ ament-cmake ]; meta = { description = ''PlotJuggler: juggle with data''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/foxy/pmb2-2dnav-gazebo/default.nix b/distros/foxy/pmb2-2dnav-gazebo/default.nix index 8efd9b92ce..0d10afa4a6 100644 --- a/distros/foxy/pmb2-2dnav-gazebo/default.nix +++ b/distros/foxy/pmb2-2dnav-gazebo/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''PMB2-specific launch files needed to run navigation on the PMB2 robot.''; - license = with lib.licenses; [ "Modified BSD" ]; + license = with lib.licenses; [ "Modified-BSD" ]; }; } diff --git a/distros/foxy/pmb2-gazebo/default.nix b/distros/foxy/pmb2-gazebo/default.nix index 793c304fab..47c0da54e7 100644 --- a/distros/foxy/pmb2-gazebo/default.nix +++ b/distros/foxy/pmb2-gazebo/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Simulation files for the PMB2 robot.''; - license = with lib.licenses; [ "Modified BSD" ]; + license = with lib.licenses; [ "Modified-BSD" ]; }; } diff --git a/distros/foxy/point-cloud-msg-wrapper/default.nix b/distros/foxy/point-cloud-msg-wrapper/default.nix index 0b4cbd57ea..e572339efb 100644 --- a/distros/foxy/point-cloud-msg-wrapper/default.nix +++ b/distros/foxy/point-cloud-msg-wrapper/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "1.0.7-r1"; src = fetchurl { - url = "https://gitlab.com/ApexAI/point_cloud_msg_wrapper-release/-/archive/release/foxy/point_cloud_msg_wrapper/1.0.7-1/point_cloud_msg_wrapper-release-release-foxy-point_cloud_msg_wrapper-1.0.7-1.tar.gz"; - name = "point_cloud_msg_wrapper-release-release-foxy-point_cloud_msg_wrapper-1.0.7-1.tar.gz"; - sha256 = "552051203ff6efe317e11675745a88de303e3f51490cdc4947a5b8d981ee7277"; + url = "https://gitlab.com/ApexAI/point_cloud_msg_wrapper-release/-/archive/release/foxy/point_cloud_msg_wrapper/1.0.7-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "4227bbd13ddd88f4a342779157cae33de4c008f0347013b33aea2bd8c2a769b5"; }; buildType = "ament_cmake"; diff --git a/distros/foxy/psen-scan-v2/default.nix b/distros/foxy/psen-scan-v2/default.nix index 678f245dfc..a39bf6f86b 100644 --- a/distros/foxy/psen-scan-v2/default.nix +++ b/distros/foxy/psen-scan-v2/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''ROS support for the Pilz laser scanner''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/foxy/qpoases-vendor/default.nix b/distros/foxy/qpoases-vendor/default.nix index d0e6a937e4..a82e26c2be 100644 --- a/distros/foxy/qpoases-vendor/default.nix +++ b/distros/foxy/qpoases-vendor/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Wrapper around qpOASES to make it available to the ROS ecosystem.''; - license = with lib.licenses; [ asl20 lgpl2 ]; + license = with lib.licenses; [ asl20 "LGPL" ]; }; } diff --git a/distros/foxy/rclc-examples/default.nix b/distros/foxy/rclc-examples/default.nix index 0e308c1f2b..a25ea63553 100644 --- a/distros/foxy/rclc-examples/default.nix +++ b/distros/foxy/rclc-examples/default.nix @@ -2,19 +2,19 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake-ros, example-interfaces, lifecycle-msgs, rcl, rclc, rclc-lifecycle, std-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake-ros, example-interfaces, lifecycle-msgs, rcl, rclc, rclc-lifecycle, rclc-parameter, std-msgs }: buildRosPackage { pname = "ros-foxy-rclc-examples"; - version = "1.1.0-r1"; + version = "1.1.1-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/rclc-release/archive/release/foxy/rclc_examples/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "b91a7a11d36cf1a312eb67cf7f52ea2b51369a66bd622a6cb1e17ec63bb9229d"; + url = "https://github.com/ros2-gbp/rclc-release/archive/release/foxy/rclc_examples/1.1.1-1.tar.gz"; + name = "1.1.1-1.tar.gz"; + sha256 = "ca7fff48cba64fcbbb6b297264a76737e6a50d207cf87bf4c55bf7966a021314"; }; buildType = "ament_cmake"; - propagatedBuildInputs = [ example-interfaces lifecycle-msgs rcl rclc rclc-lifecycle std-msgs ]; + propagatedBuildInputs = [ example-interfaces lifecycle-msgs rcl rclc rclc-lifecycle rclc-parameter std-msgs ]; nativeBuildInputs = [ ament-cmake-ros ]; meta = { diff --git a/distros/foxy/rclc-lifecycle/default.nix b/distros/foxy/rclc-lifecycle/default.nix index 7749c76d12..03f5527448 100644 --- a/distros/foxy/rclc-lifecycle/default.nix +++ b/distros/foxy/rclc-lifecycle/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake-ros, ament-lint-auto, ament-lint-common, lifecycle-msgs, osrf-testing-tools-cpp, rcl-lifecycle, rclc }: buildRosPackage { pname = "ros-foxy-rclc-lifecycle"; - version = "1.1.0-r1"; + version = "1.1.1-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/rclc-release/archive/release/foxy/rclc_lifecycle/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "cb99511b0ec97a571c0e624077dddabdfeeceaa2f62783018a8c17393bcbc25b"; + url = "https://github.com/ros2-gbp/rclc-release/archive/release/foxy/rclc_lifecycle/1.1.1-1.tar.gz"; + name = "1.1.1-1.tar.gz"; + sha256 = "015a9e3b82d73480998a876155a537e68a01ece2e22182231c61c4c9ba127250"; }; buildType = "ament_cmake"; diff --git a/distros/foxy/rclc-parameter/default.nix b/distros/foxy/rclc-parameter/default.nix new file mode 100644 index 0000000000..762190428b --- /dev/null +++ b/distros/foxy/rclc-parameter/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake-pytest, ament-cmake-ros, ament-lint-auto, ament-lint-common, builtin-interfaces, example-interfaces, osrf-testing-tools-cpp, rcl, rcl-interfaces, rclc, rclcpp, rcutils, rosidl-runtime-c, std-msgs }: +buildRosPackage { + pname = "ros-foxy-rclc-parameter"; + version = "1.1.1-r1"; + + src = fetchurl { + url = "https://github.com/ros2-gbp/rclc-release/archive/release/foxy/rclc_parameter/1.1.1-1.tar.gz"; + name = "1.1.1-1.tar.gz"; + sha256 = "c6da2727f71faa465d32fb16a35d58622f6c6fedc873614b3f61054cb7c89951"; + }; + + buildType = "ament_cmake"; + checkInputs = [ ament-cmake-gtest ament-cmake-pytest ament-lint-auto ament-lint-common example-interfaces osrf-testing-tools-cpp rclcpp std-msgs ]; + propagatedBuildInputs = [ builtin-interfaces rcl rcl-interfaces rclc rcutils rosidl-runtime-c ]; + nativeBuildInputs = [ ament-cmake-ros ]; + + meta = { + description = ''Parameter server implementation for micro-ROS nodes''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/foxy/rclc/default.nix b/distros/foxy/rclc/default.nix index 1f80f23467..26b298957a 100644 --- a/distros/foxy/rclc/default.nix +++ b/distros/foxy/rclc/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake-gtest, ament-cmake-pytest, ament-cmake-ros, ament-lint-auto, ament-lint-common, example-interfaces, launch-testing, osrf-testing-tools-cpp, rcl, rcutils, rosidl-generator-c, rosidl-typesupport-c, std-msgs, test-msgs }: buildRosPackage { pname = "ros-foxy-rclc"; - version = "1.1.0-r1"; + version = "1.1.1-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/rclc-release/archive/release/foxy/rclc/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "516a522d674cce7feedd4a63906bc43c370938bf95e33590905979e0c3683d82"; + url = "https://github.com/ros2-gbp/rclc-release/archive/release/foxy/rclc/1.1.1-1.tar.gz"; + name = "1.1.1-1.tar.gz"; + sha256 = "f57f69375c791ad71b6c32d2f50a05af3450c6c491b717148f05a93787ff1c8a"; }; buildType = "ament_cmake"; diff --git a/distros/foxy/realsense-hardware-interface/default.nix b/distros/foxy/realsense-hardware-interface/default.nix index 1509d573a5..1950ad858b 100644 --- a/distros/foxy/realsense-hardware-interface/default.nix +++ b/distros/foxy/realsense-hardware-interface/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''ros2 hardware interface for realsense camera''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "apache-2.0" ]; }; } diff --git a/distros/foxy/realsense2-camera-msgs/default.nix b/distros/foxy/realsense2-camera-msgs/default.nix index f1b4aa7ed4..4f4fada934 100644 --- a/distros/foxy/realsense2-camera-msgs/default.nix +++ b/distros/foxy/realsense2-camera-msgs/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-common, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-foxy-realsense2-camera-msgs"; - version = "4.0.2-r1"; + version = "4.0.4-r1"; src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/foxy/realsense2_camera_msgs/4.0.2-1.tar.gz"; - name = "4.0.2-1.tar.gz"; - sha256 = "61e336e0799b56ff9422fbde6dac20d0432516befbbe54f2fbbd030b092d5087"; + url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/foxy/realsense2_camera_msgs/4.0.4-1.tar.gz"; + name = "4.0.4-1.tar.gz"; + sha256 = "326781ffcc20e422261bc3d8021a8d934ae5bdeccb5c73e62e9508e781d87988"; }; buildType = "ament_cmake"; @@ -19,7 +19,7 @@ buildRosPackage { nativeBuildInputs = [ ament-cmake rosidl-default-generators ]; meta = { - description = ''A package containing realsense camera messages definitions.''; + description = ''RealSense camera_msgs package containing realsense camera messages definitions''; license = with lib.licenses; [ asl20 ]; }; } diff --git a/distros/foxy/realsense2-camera/default.nix b/distros/foxy/realsense2-camera/default.nix index 0832b368ef..1907906cd1 100644 --- a/distros/foxy/realsense2-camera/default.nix +++ b/distros/foxy/realsense2-camera/default.nix @@ -2,25 +2,25 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, builtin-interfaces, cv-bridge, diagnostic-updater, eigen, geometry-msgs, image-transport, launch-ros, librealsense2, opencv3, rclcpp, rclcpp-components, realsense2-camera-msgs, ros-environment, sensor-msgs, std-msgs, tf2, tf2-ros }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, builtin-interfaces, cv-bridge, diagnostic-updater, eigen, geometry-msgs, image-transport, launch-ros, librealsense2, nav-msgs, opencv3, rclcpp, rclcpp-components, realsense2-camera-msgs, ros-environment, sensor-msgs, std-msgs, tf2, tf2-ros }: buildRosPackage { pname = "ros-foxy-realsense2-camera"; - version = "4.0.2-r1"; + version = "4.0.4-r1"; src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/foxy/realsense2_camera/4.0.2-1.tar.gz"; - name = "4.0.2-1.tar.gz"; - sha256 = "79c6f5f97c2f31343085597d0272af76cbf4a8ba8ee63ead7b606c991cb2b5e6"; + url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/foxy/realsense2_camera/4.0.4-1.tar.gz"; + name = "4.0.4-1.tar.gz"; + sha256 = "c07648b244e80c46ee9075fdd65a0d3fbd0bc595f2f951e21e46d158eede83e5"; }; buildType = "ament_cmake"; buildInputs = [ ros-environment ]; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common opencv3 ]; - propagatedBuildInputs = [ builtin-interfaces cv-bridge diagnostic-updater eigen geometry-msgs image-transport launch-ros librealsense2 rclcpp rclcpp-components realsense2-camera-msgs sensor-msgs std-msgs tf2 tf2-ros ]; + propagatedBuildInputs = [ builtin-interfaces cv-bridge diagnostic-updater eigen geometry-msgs image-transport launch-ros librealsense2 nav-msgs rclcpp rclcpp-components realsense2-camera-msgs sensor-msgs std-msgs tf2 tf2-ros ]; nativeBuildInputs = [ ament-cmake ]; meta = { - description = ''RealSense Camera package allowing access to Intel T265 Tracking module and SR300 and D400 3D cameras''; + description = ''RealSense camera package allowing access to Intel T265 Tracking module and SR300 and D400 3D cameras''; license = with lib.licenses; [ asl20 ]; }; } diff --git a/distros/foxy/realsense2-description/default.nix b/distros/foxy/realsense2-description/default.nix index aa29e584b1..5b95305143 100644 --- a/distros/foxy/realsense2-description/default.nix +++ b/distros/foxy/realsense2-description/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, launch-ros, rclcpp, rclcpp-components, realsense2-camera-msgs, xacro }: buildRosPackage { pname = "ros-foxy-realsense2-description"; - version = "4.0.2-r1"; + version = "4.0.4-r1"; src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/foxy/realsense2_description/4.0.2-1.tar.gz"; - name = "4.0.2-1.tar.gz"; - sha256 = "1ecba40f3b2b9279cef5376d7f2e48e7ce686fee89ed0af0ce8210ca762bf661"; + url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/foxy/realsense2_description/4.0.4-1.tar.gz"; + name = "4.0.4-1.tar.gz"; + sha256 = "e68b7ccd5281d036c9b999e866ac9b128340d1d6472e19453c63527e464af135"; }; buildType = "ament_cmake"; @@ -19,7 +19,7 @@ buildRosPackage { nativeBuildInputs = [ ament-cmake ]; meta = { - description = ''RealSense Camera description package for Intel 3D D400 cameras''; + description = ''RealSense description package for Intel 3D D400 cameras''; license = with lib.licenses; [ asl20 ]; }; } diff --git a/distros/foxy/rmf-demos-tasks/default.nix b/distros/foxy/rmf-demos-tasks/default.nix index 6905307e26..19db62015d 100644 --- a/distros/foxy/rmf-demos-tasks/default.nix +++ b/distros/foxy/rmf-demos-tasks/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''A package containing scripts for demos''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "Apache-Licence-2.0" ]; }; } diff --git a/distros/foxy/ros2trace-analysis/default.nix b/distros/foxy/ros2trace-analysis/default.nix index d1dc7aaddd..6b10f08abd 100644 --- a/distros/foxy/ros2trace-analysis/default.nix +++ b/distros/foxy/ros2trace-analysis/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "1.0.3-r1"; src = fetchurl { - url = "https://gitlab.com/ros-tracing/tracetools_analysis-release/-/archive/release/foxy/ros2trace_analysis/1.0.3-1/tracetools_analysis-release-release-foxy-ros2trace_analysis-1.0.3-1.tar.gz"; - name = "tracetools_analysis-release-release-foxy-ros2trace_analysis-1.0.3-1.tar.gz"; - sha256 = "4cb6188b451d8fb208353528850b75d5551605615aa9942de7e6a307119b6a88"; + url = "https://gitlab.com/ros-tracing/tracetools_analysis-release/-/archive/release/foxy/ros2trace_analysis/1.0.3-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "e6557a80c5a0fa101ebd086ffdd93575239e0cbf6f92a6aa8811494a3c1dc395"; }; buildType = "ament_python"; diff --git a/distros/foxy/rosxbeepy/default.nix b/distros/foxy/rosxbeepy/default.nix index 3f15fcbae8..7046c297a6 100644 --- a/distros/foxy/rosxbeepy/default.nix +++ b/distros/foxy/rosxbeepy/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''A ROS2 wrapper for xbee devices using digi-xbee python API''; - license = with lib.licenses; [ "TODO: License declaration" ]; + license = with lib.licenses; [ "TODO-License-declaration" ]; }; } diff --git a/distros/foxy/rover-bringup/default.nix b/distros/foxy/rover-bringup/default.nix index cead538ae8..f470d773e9 100644 --- a/distros/foxy/rover-bringup/default.nix +++ b/distros/foxy/rover-bringup/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Launch files and configuration scripts for operation of the Rover and suported sensors.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/rover-description/default.nix b/distros/foxy/rover-description/default.nix index 87018447c5..8cd81351f1 100644 --- a/distros/foxy/rover-description/default.nix +++ b/distros/foxy/rover-description/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''URDF description of Rover.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/rover-driver/default.nix b/distros/foxy/rover-driver/default.nix index d9ceb2c450..535f38a255 100644 --- a/distros/foxy/rover-driver/default.nix +++ b/distros/foxy/rover-driver/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Serial driver for Rover platform.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/rover-msgs/default.nix b/distros/foxy/rover-msgs/default.nix index 62230d1acb..57165b9a19 100644 --- a/distros/foxy/rover-msgs/default.nix +++ b/distros/foxy/rover-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Messages for communicating with a Rover Pro.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/rover-navigation/default.nix b/distros/foxy/rover-navigation/default.nix index 56185dc696..5b8f5a71bc 100644 --- a/distros/foxy/rover-navigation/default.nix +++ b/distros/foxy/rover-navigation/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Contains Rover navigation launch files''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/rover-simulation/default.nix b/distros/foxy/rover-simulation/default.nix index 01b9a630a5..b08e5e882e 100644 --- a/distros/foxy/rover-simulation/default.nix +++ b/distros/foxy/rover-simulation/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Launch files for Rover Simulation''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/rover-teleop/default.nix b/distros/foxy/rover-teleop/default.nix index 23205fe620..7151870ddf 100644 --- a/distros/foxy/rover-teleop/default.nix +++ b/distros/foxy/rover-teleop/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Contains Rover provided teleoperation applications.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/roverrobotics-ros2/default.nix b/distros/foxy/roverrobotics-ros2/default.nix index a69c6de5df..c49862bbf1 100644 --- a/distros/foxy/roverrobotics-ros2/default.nix +++ b/distros/foxy/roverrobotics-ros2/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Messages for communicating with a Rover Pro.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/foxy/rqt-robot-monitor/default.nix b/distros/foxy/rqt-robot-monitor/default.nix index 24572440a1..1322f8b0d1 100644 --- a/distros/foxy/rqt-robot-monitor/default.nix +++ b/distros/foxy/rqt-robot-monitor/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, diagnostic-msgs, python-qt-binding, python3Packages, qt-gui, qt-gui-py-common, rclpy, rosidl-default-generators, rqt-gui, rqt-gui-py, rqt-py-common }: buildRosPackage { pname = "ros-foxy-rqt-robot-monitor"; - version = "1.0.4-r1"; + version = "1.0.5-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_robot_monitor-release/archive/release/foxy/rqt_robot_monitor/1.0.4-1.tar.gz"; - name = "1.0.4-1.tar.gz"; - sha256 = "35a752c5e4b9496c554a4c1a32eab60797ca13a4a5d6a46cdc64a902b5de8508"; + url = "https://github.com/ros2-gbp/rqt_robot_monitor-release/archive/release/foxy/rqt_robot_monitor/1.0.5-1.tar.gz"; + name = "1.0.5-1.tar.gz"; + sha256 = "0aad78d4049e71e4134c5208b650763283c08434d737604ec4d27543f55d6aea"; }; buildType = "ament_python"; diff --git a/distros/foxy/run-moveit-cpp/default.nix b/distros/foxy/run-moveit-cpp/default.nix index 99c7d2ca25..245c259525 100644 --- a/distros/foxy/run-moveit-cpp/default.nix +++ b/distros/foxy/run-moveit-cpp/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''TODO: Package description''; - license = with lib.licenses; [ "TODO: License declaration" ]; + license = with lib.licenses; [ "TODO-License-declaration" ]; }; } diff --git a/distros/foxy/slam-toolbox/default.nix b/distros/foxy/slam-toolbox/default.nix index 4083964d54..dbe607fc48 100644 --- a/distros/foxy/slam-toolbox/default.nix +++ b/distros/foxy/slam-toolbox/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package provides a sped up improved slam karto with updated SDK and visualization and modification toolsets''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/foxy/slider-publisher/default.nix b/distros/foxy/slider-publisher/default.nix index c73296ed24..de1c0763f0 100644 --- a/distros/foxy/slider-publisher/default.nix +++ b/distros/foxy/slider-publisher/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, rqt-gui-py }: buildRosPackage { pname = "ros-foxy-slider-publisher"; - version = "2.0.1-r1"; + version = "2.1.0-r1"; src = fetchurl { - url = "https://github.com/oKermorgant/slider_publisher-release/archive/release/foxy/slider_publisher/2.0.1-1.tar.gz"; - name = "2.0.1-1.tar.gz"; - sha256 = "01b7914b50f8a8efbe30490bf31a87432db54760d97976b56f860061dfd34c8d"; + url = "https://github.com/oKermorgant/slider_publisher-release/archive/release/foxy/slider_publisher/2.1.0-1.tar.gz"; + name = "2.1.0-1.tar.gz"; + sha256 = "7715b3d46594607c62853e0730287afc8115c0064e095ba1a15d8058595f4075"; }; buildType = "ament_python"; diff --git a/distros/foxy/spatio-temporal-voxel-layer/default.nix b/distros/foxy/spatio-temporal-voxel-layer/default.nix index 18051d83cc..25fb624a9c 100644 --- a/distros/foxy/spatio-temporal-voxel-layer/default.nix +++ b/distros/foxy/spatio-temporal-voxel-layer/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''The spatio-temporal 3D obstacle costmap package''; - license = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-only" ]; }; } diff --git a/distros/foxy/tango-icons-vendor/default.nix b/distros/foxy/tango-icons-vendor/default.nix index 2685683bcd..7b3fc987d7 100644 --- a/distros/foxy/tango-icons-vendor/default.nix +++ b/distros/foxy/tango-icons-vendor/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''tango_icons_vendor provides the public domain Tango icons for non-linux systems (Tango Icon Library) from the Tango Desktop Project''; - license = with lib.licenses; [ asl20 publicDomain ]; + license = with lib.licenses; [ asl20 "PD" ]; }; } diff --git a/distros/foxy/teleop-twist-keyboard/default.nix b/distros/foxy/teleop-twist-keyboard/default.nix index 1f15d07d48..b4308c9000 100644 --- a/distros/foxy/teleop-twist-keyboard/default.nix +++ b/distros/foxy/teleop-twist-keyboard/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''A robot-agnostic teleoperation node to convert keyboard commands to Twist messages.''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-License-2.0" ]; }; } diff --git a/distros/foxy/test-apex-test-tools/default.nix b/distros/foxy/test-apex-test-tools/default.nix index 898f24484a..b41c5c966c 100644 --- a/distros/foxy/test-apex-test-tools/default.nix +++ b/distros/foxy/test-apex-test-tools/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.0.2-r1"; src = fetchurl { - url = "https://gitlab.com/ApexAI/apex_test_tools-release/-/archive/release/foxy/test_apex_test_tools/0.0.2-1/apex_test_tools-release-release-foxy-test_apex_test_tools-0.0.2-1.tar.gz"; - name = "apex_test_tools-release-release-foxy-test_apex_test_tools-0.0.2-1.tar.gz"; - sha256 = "275623d9706e2f131b95b40c5f3b082069078ece9a0bb76f2dfc3e4359cf763d"; + url = "https://gitlab.com/ApexAI/apex_test_tools-release/-/archive/release/foxy/test_apex_test_tools/0.0.2-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "8f2a8281836a6ef61d778b7196cd77998aa4557285574064931e62e925832e5e"; }; buildType = "ament_cmake"; diff --git a/distros/foxy/tlsf-cpp/default.nix b/distros/foxy/tlsf-cpp/default.nix index e96a9b62bd..3c887845ed 100644 --- a/distros/foxy/tlsf-cpp/default.nix +++ b/distros/foxy/tlsf-cpp/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''C++ stdlib-compatible wrapper around tlsf allocator and ROS2 examples''; - license = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-only" ]; }; } diff --git a/distros/foxy/tlsf/default.nix b/distros/foxy/tlsf/default.nix index a1008aa1b5..a286d9f459 100644 --- a/distros/foxy/tlsf/default.nix +++ b/distros/foxy/tlsf/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''TLSF allocator version 2.4.6''; - license = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-only" ]; }; } diff --git a/distros/foxy/tvm-vendor/default.nix b/distros/foxy/tvm-vendor/default.nix index 9e969adca5..8302e98da7 100644 --- a/distros/foxy/tvm-vendor/default.nix +++ b/distros/foxy/tvm-vendor/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "60f57740a85c06ac445b2a97b0601e634ee9f6a3b27577f411d79660ccde8e8e"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment ]; propagatedBuildInputs = [ git libxml2 openblas spirv-headers spirv-tools vulkan-loader ]; nativeBuildInputs = [ ament-cmake ]; diff --git a/distros/foxy/uncrustify-vendor/default.nix b/distros/foxy/uncrustify-vendor/default.nix index 703da606b2..ee05a64be4 100644 --- a/distros/foxy/uncrustify-vendor/default.nix +++ b/distros/foxy/uncrustify-vendor/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Wrapper around uncrustify, providing nothing but a dependency on uncrustify, on some systems. On others, it provides an ExternalProject build of uncrustify.''; - license = with lib.licenses; [ asl20 gpl2 ]; + license = with lib.licenses; [ asl20 "GPL-2.0-only" ]; }; } diff --git a/distros/foxy/ur-client-library/default.nix b/distros/foxy/ur-client-library/default.nix index 04ef4cebfb..435ff6ffe3 100644 --- a/distros/foxy/ur-client-library/default.nix +++ b/distros/foxy/ur-client-library/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Standalone C++ library for accessing Universal Robots interfaces. This has been forked off the ur_robot_driver.''; - license = with lib.licenses; [ asl20 bsd2 "Zlib" mit ]; + license = with lib.licenses; [ asl20 "BSD-2-Clause" "Zlib" mit ]; }; } diff --git a/distros/foxy/wiimote/default.nix b/distros/foxy/wiimote/default.nix index 58ee88c325..ca2dcb3aad 100644 --- a/distros/foxy/wiimote/default.nix +++ b/distros/foxy/wiimote/default.nix @@ -28,6 +28,6 @@ buildRosPackage { nodes to control the Wiimote's LEDs and vibration for feedback to the human Wiimote operator. LEDs and vibration may be switched on and off, or made to operate according to a timed pattern.''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/galactic/ament-nodl/default.nix b/distros/galactic/ament-nodl/default.nix index e37ce5cec5..f4c5491ad7 100644 --- a/distros/galactic/ament-nodl/default.nix +++ b/distros/galactic/ament-nodl/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Ament extension for exporting NoDL .xml files''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/galactic/apriltag/default.nix b/distros/galactic/apriltag/default.nix index 9c0423a924..a763e0deba 100644 --- a/distros/galactic/apriltag/default.nix +++ b/distros/galactic/apriltag/default.nix @@ -2,19 +2,20 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, cmake, python3Packages }: +{ lib, buildRosPackage, fetchurl, cmake, opencv3, python3Packages }: buildRosPackage { pname = "ros-galactic-apriltag"; - version = "3.1.5-r1"; + version = "3.2.0-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/apriltag-release/archive/release/galactic/apriltag/3.1.5-1.tar.gz"; - name = "3.1.5-1.tar.gz"; - sha256 = "e40e41d3184b4948b52917e24c2f20dd0ea5ed255f32828fe6ab77284b0c1f1d"; + url = "https://github.com/ros2-gbp/apriltag-release/archive/release/galactic/apriltag/3.2.0-1.tar.gz"; + name = "3.2.0-1.tar.gz"; + sha256 = "fb172918ad557a8d0c484decf3ce98c17de99d87fd483432636aa28dd1a575fa"; }; buildType = "cmake"; buildInputs = [ python3Packages.numpy ]; + checkInputs = [ opencv3 ]; nativeBuildInputs = [ cmake ]; meta = { diff --git a/distros/galactic/asio-cmake-module/default.nix b/distros/galactic/asio-cmake-module/default.nix index b1c0292627..5b9fdbdcdc 100644 --- a/distros/galactic/asio-cmake-module/default.nix +++ b/distros/galactic/asio-cmake-module/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common }: buildRosPackage { pname = "ros-galactic-asio-cmake-module"; - version = "1.0.1-r1"; + version = "1.1.1-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/galactic/asio_cmake_module/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "d99bfb223aacbe7fa819e07123708eaeddc0a78c0861bf50a93bbab34e4a5616"; + url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/galactic/asio_cmake_module/1.1.1-1.tar.gz"; + name = "1.1.1-1.tar.gz"; + sha256 = "6637bf183dcfbd6c3f2e4f0900b776f3f98b8fccabb5e55ba0bce5a49c0594ff"; }; buildType = "ament_cmake"; diff --git a/distros/galactic/automotive-autonomy-msgs/default.nix b/distros/galactic/automotive-autonomy-msgs/default.nix index cc2f9e974d..8f929e34b5 100644 --- a/distros/galactic/automotive-autonomy-msgs/default.nix +++ b/distros/galactic/automotive-autonomy-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "3db764baa8bb3f64600c8e538af5c3a4d7a21ed8a14d1b9fd21e3787a19bf7fd"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment ]; propagatedBuildInputs = [ automotive-navigation-msgs automotive-platform-msgs ]; nativeBuildInputs = [ ament-cmake ]; diff --git a/distros/galactic/automotive-navigation-msgs/default.nix b/distros/galactic/automotive-navigation-msgs/default.nix index eef8835822..5ebf94704f 100644 --- a/distros/galactic/automotive-navigation-msgs/default.nix +++ b/distros/galactic/automotive-navigation-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "2c8427a76cdb711fb50f86d221f03437f841e5381fff92a915e2b773a65d274c"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces geometry-msgs rosidl-default-runtime std-msgs ]; diff --git a/distros/galactic/automotive-platform-msgs/default.nix b/distros/galactic/automotive-platform-msgs/default.nix index de7cd5e7a6..78056c6556 100644 --- a/distros/galactic/automotive-platform-msgs/default.nix +++ b/distros/galactic/automotive-platform-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "9fc8aa25dbb5300ee388979528c8ee5a37ad43ffa234ab8359909237a010498c"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime std-msgs ]; diff --git a/distros/galactic/aws-robomaker-small-warehouse-world/default.nix b/distros/galactic/aws-robomaker-small-warehouse-world/default.nix index c46f35896c..6eb7c94939 100644 --- a/distros/galactic/aws-robomaker-small-warehouse-world/default.nix +++ b/distros/galactic/aws-robomaker-small-warehouse-world/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''AWS RoboMaker package for a warehouse world to use in manufacturing and logistics robot applications.''; - license = with lib.licenses; [ mit ]; + license = with lib.licenses; [ "MIT-0" ]; }; } diff --git a/distros/galactic/behaviortree-cpp-v3/default.nix b/distros/galactic/behaviortree-cpp-v3/default.nix index 496f3d120b..2d3e43346b 100644 --- a/distros/galactic/behaviortree-cpp-v3/default.nix +++ b/distros/galactic/behaviortree-cpp-v3/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "f758f7b28a9bd5c8f320b60f4dde01e4e5824c35d8188e604a6ba5cee3baf810"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ ament-cmake-gtest ]; propagatedBuildInputs = [ boost cppzmq ncurses rclcpp ]; nativeBuildInputs = [ ament-cmake ]; diff --git a/distros/galactic/costmap-queue/default.nix b/distros/galactic/costmap-queue/default.nix index aed7f44a71..40defe0748 100644 --- a/distros/galactic/costmap-queue/default.nix +++ b/distros/galactic/costmap-queue/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''The costmap_queue package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/cyclonedds/default.nix b/distros/galactic/cyclonedds/default.nix index 7c391db5c9..59cafd8bb4 100644 --- a/distros/galactic/cyclonedds/default.nix +++ b/distros/galactic/cyclonedds/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Eclipse Cyclone DDS is a very performant and robust open-source DDS implementation. Cyclone DDS is developed completely in the open as an Eclipse IoT project.''; - license = with lib.licenses; [ "Eclipse Public License 2.0" "Eclipse Distribution License 1.0" ]; + license = with lib.licenses; [ "EPL-2.0" "Eclipse-Distribution-License-1.0" ]; }; } diff --git a/distros/galactic/dwb-core/default.nix b/distros/galactic/dwb-core/default.nix index c526c70bad..795dea964b 100644 --- a/distros/galactic/dwb-core/default.nix +++ b/distros/galactic/dwb-core/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''TODO''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/dwb-critics/default.nix b/distros/galactic/dwb-critics/default.nix index 64ef56d61a..d6a6dd634a 100644 --- a/distros/galactic/dwb-critics/default.nix +++ b/distros/galactic/dwb-critics/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''The dwb_critics package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/dwb-msgs/default.nix b/distros/galactic/dwb-msgs/default.nix index bf64b045e2..76c35b41f9 100644 --- a/distros/galactic/dwb-msgs/default.nix +++ b/distros/galactic/dwb-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Message/Service definitions specifically for the dwb_core''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/dwb-plugins/default.nix b/distros/galactic/dwb-plugins/default.nix index e0978eb130..03c48ef265 100644 --- a/distros/galactic/dwb-plugins/default.nix +++ b/distros/galactic/dwb-plugins/default.nix @@ -22,6 +22,6 @@ buildRosPackage { meta = { description = ''Standard implementations of the GoalChecker and TrajectoryGenerators for dwb_core''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/fmilibrary-vendor/default.nix b/distros/galactic/fmilibrary-vendor/default.nix index 5c042949a0..a3013a05fd 100644 --- a/distros/galactic/fmilibrary-vendor/default.nix +++ b/distros/galactic/fmilibrary-vendor/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Wrapper (aka vendor package) around the FMILibrary by Modelon AB (JModelica.org)''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/foonathan-memory-vendor/default.nix b/distros/galactic/foonathan-memory-vendor/default.nix index 777c819a99..e224a88bb8 100644 --- a/distros/galactic/foonathan-memory-vendor/default.nix +++ b/distros/galactic/foonathan-memory-vendor/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Foonathan/memory vendor package for Fast-RTPS.''; - license = with lib.licenses; [ asl20 "zlib License" ]; + license = with lib.licenses; [ asl20 "Zlib" ]; }; } diff --git a/distros/galactic/gazebo-plugins/default.nix b/distros/galactic/gazebo-plugins/default.nix index 7d0cedb040..71ba265129 100644 --- a/distros/galactic/gazebo-plugins/default.nix +++ b/distros/galactic/gazebo-plugins/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components.''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-&-Apache-2.0" ]; }; } diff --git a/distros/galactic/gazebo-ros-pkgs/default.nix b/distros/galactic/gazebo-ros-pkgs/default.nix index 30aab8a1fd..f888d7a17f 100644 --- a/distros/galactic/gazebo-ros-pkgs/default.nix +++ b/distros/galactic/gazebo-ros-pkgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Interface for using ROS with the Gazebo simulator.''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-&-LGPL-&-Apache-2.0" ]; }; } diff --git a/distros/galactic/generated.nix b/distros/galactic/generated.nix index 32714ab012..7f8d6a01f9 100644 --- a/distros/galactic/generated.nix +++ b/distros/galactic/generated.nix @@ -532,6 +532,8 @@ self: super: { lua-vendor = self.callPackage ./lua-vendor {}; + magic-enum = self.callPackage ./magic-enum {}; + map-msgs = self.callPackage ./map-msgs {}; mapviz = self.callPackage ./mapviz {}; @@ -784,6 +786,10 @@ self: super: { ouxt-lint-common = self.callPackage ./ouxt-lint-common {}; + paho-mqtt-c = self.callPackage ./paho-mqtt-c {}; + + paho-mqtt-cpp = self.callPackage ./paho-mqtt-cpp {}; + pal-statistics = self.callPackage ./pal-statistics {}; pal-statistics-msgs = self.callPackage ./pal-statistics-msgs {}; @@ -1364,6 +1370,8 @@ self: super: { slam-toolbox = self.callPackage ./slam-toolbox {}; + slider-publisher = self.callPackage ./slider-publisher {}; + smacc2 = self.callPackage ./smacc2 {}; smacc2-msgs = self.callPackage ./smacc2-msgs {}; @@ -1500,6 +1508,10 @@ self: super: { topic-statistics-demo = self.callPackage ./topic-statistics-demo {}; + topic-tools = self.callPackage ./topic-tools {}; + + topic-tools-interfaces = self.callPackage ./topic-tools-interfaces {}; + tracetools = self.callPackage ./tracetools {}; tracetools-launch = self.callPackage ./tracetools-launch {}; diff --git a/distros/galactic/gscam/default.nix b/distros/galactic/gscam/default.nix index f7e257a3a4..bcf423926a 100644 --- a/distros/galactic/gscam/default.nix +++ b/distros/galactic/gscam/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''A ROS camera driver that uses gstreamer to connect to devices such as webcams.''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "Apache-2.0-License" ]; }; } diff --git a/distros/galactic/hash-library-vendor/default.nix b/distros/galactic/hash-library-vendor/default.nix index e36386368b..4e261ed435 100644 --- a/distros/galactic/hash-library-vendor/default.nix +++ b/distros/galactic/hash-library-vendor/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ROS2 vendor package for stbrumme/hash-library''; - license = with lib.licenses; [ asl20 "Zlib License" ]; + license = with lib.licenses; [ asl20 "Zlib-License" ]; }; } diff --git a/distros/galactic/ign-ros2-control-demos/default.nix b/distros/galactic/ign-ros2-control-demos/default.nix index 6588a16ad6..b27829a791 100644 --- a/distros/galactic/ign-ros2-control-demos/default.nix +++ b/distros/galactic/ign-ros2-control-demos/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-index-python, ament-lint-auto, ament-lint-common, control-msgs, diff-drive-controller, effort-controllers, geometry-msgs, hardware-interface, ign-ros2-control, imu-sensor-broadcaster, joint-state-broadcaster, joint-trajectory-controller, launch, launch-ros, rclcpp, rclcpp-action, robot-state-publisher, ros-ign-gazebo, ros2controlcli, std-msgs, velocity-controllers, xacro }: buildRosPackage { pname = "ros-galactic-ign-ros2-control-demos"; - version = "0.2.0-r1"; + version = "0.4.0-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/ign_ros2_control-release/archive/release/galactic/ign_ros2_control_demos/0.2.0-1.tar.gz"; - name = "0.2.0-1.tar.gz"; - sha256 = "659f9efc644601052665d0505a19997e25654115903f8ce9dd8d83e6681cdaba"; + url = "https://github.com/ros2-gbp/ign_ros2_control-release/archive/release/galactic/ign_ros2_control_demos/0.4.0-1.tar.gz"; + name = "0.4.0-1.tar.gz"; + sha256 = "36be1f1b2cb4bfb71b65f7ffeec9db17b6c642e1c2c267ed158f618e88a95f7a"; }; buildType = "ament_cmake"; diff --git a/distros/galactic/io-context/default.nix b/distros/galactic/io-context/default.nix index 22a378b391..c1bd7e7f45 100644 --- a/distros/galactic/io-context/default.nix +++ b/distros/galactic/io-context/default.nix @@ -2,20 +2,20 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake-auto, ament-cmake-gtest, ament-lint-auto, ament-lint-common, asio, asio-cmake-module, example-interfaces, rclcpp, std-msgs, udp-msgs }: +{ lib, buildRosPackage, fetchurl, ament-cmake-auto, ament-cmake-gtest, ament-lint-auto, ament-lint-common, asio, asio-cmake-module, rclcpp, std-msgs, udp-msgs }: buildRosPackage { pname = "ros-galactic-io-context"; - version = "1.0.1-r1"; + version = "1.1.1-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/galactic/io_context/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "fe1781df60e76e5eb0e03bf46f2b36127e500c65431491014d0729fdffef5a14"; + url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/galactic/io_context/1.1.1-1.tar.gz"; + name = "1.1.1-1.tar.gz"; + sha256 = "7bceb53fd40beec256ad4b4a2c1720b2d37bda18e852a3805f85bf9dca772c5e"; }; buildType = "ament_cmake"; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common ]; - propagatedBuildInputs = [ asio example-interfaces rclcpp std-msgs udp-msgs ]; + propagatedBuildInputs = [ asio rclcpp std-msgs udp-msgs ]; nativeBuildInputs = [ ament-cmake-auto asio-cmake-module ]; meta = { diff --git a/distros/galactic/lanelet2-core/default.nix b/distros/galactic/lanelet2-core/default.nix index cc9e90fe5f..1711227cfc 100644 --- a/distros/galactic/lanelet2-core/default.nix +++ b/distros/galactic/lanelet2-core/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "3b30a139e00cbc0aa372af61f2d7221d1e57b8337a142afa8d22c94893e4ce9d"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ boost eigen mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/galactic/lanelet2-examples/default.nix b/distros/galactic/lanelet2-examples/default.nix index 74d3a5f11a..e16be12fed 100644 --- a/distros/galactic/lanelet2-examples/default.nix +++ b/distros/galactic/lanelet2-examples/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "2a6851c62686aa525033545813a40ebda834d748af22a7b266f947db44e9f647"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ lanelet2-core lanelet2-io lanelet2-projection lanelet2-python lanelet2-routing lanelet2-traffic-rules mrt-cmake-modules ros2cli ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/galactic/lanelet2-io/default.nix b/distros/galactic/lanelet2-io/default.nix index 44c0bdd3be..402df89e56 100644 --- a/distros/galactic/lanelet2-io/default.nix +++ b/distros/galactic/lanelet2-io/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "8cfdafb7de8796ca131858f3b201ce6a88f94ed7657231f07bb6913776e94dd6"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ boost lanelet2-core mrt-cmake-modules pugixml ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/galactic/lanelet2-maps/default.nix b/distros/galactic/lanelet2-maps/default.nix index 14620c405b..5b2a536a8a 100644 --- a/distros/galactic/lanelet2-maps/default.nix +++ b/distros/galactic/lanelet2-maps/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "36f1c983c105112c3d70fa8cb91191cfcb415a36f3ec94ccf90050b27845a982"; }; - buildType = "catkin"; + buildType = "ament_cmake"; propagatedBuildInputs = [ lanelet2-core mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/galactic/lanelet2-projection/default.nix b/distros/galactic/lanelet2-projection/default.nix index ad309d641d..25429c6ce5 100644 --- a/distros/galactic/lanelet2-projection/default.nix +++ b/distros/galactic/lanelet2-projection/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "293354a8b0c072c64b55cc333417e3f49b111262cfa69c055eede98038bc537e"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ geographiclib lanelet2-io mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/galactic/lanelet2-python/default.nix b/distros/galactic/lanelet2-python/default.nix index 6a90282335..1de69629a3 100644 --- a/distros/galactic/lanelet2-python/default.nix +++ b/distros/galactic/lanelet2-python/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "75e6c390b165fd5389383c59ed5e91ea62fd8a06d71627a49bd980a721311e11"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ boost lanelet2-core lanelet2-io lanelet2-projection lanelet2-routing lanelet2-traffic-rules mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/galactic/lanelet2-routing/default.nix b/distros/galactic/lanelet2-routing/default.nix index 294f84432a..a857e2964c 100644 --- a/distros/galactic/lanelet2-routing/default.nix +++ b/distros/galactic/lanelet2-routing/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "cd07c8fee21f21b9550d3dbf340986fb7bec11f7417ef75660f7d9ba44aa6a2d"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ boost lanelet2-core lanelet2-traffic-rules mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/galactic/lanelet2-traffic-rules/default.nix b/distros/galactic/lanelet2-traffic-rules/default.nix index 7a3bf3be6d..a3d2b9437c 100644 --- a/distros/galactic/lanelet2-traffic-rules/default.nix +++ b/distros/galactic/lanelet2-traffic-rules/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "8ad0c5f333f79f1b842a5e4f5c9c4cca5e08b8c7480505f7988f435c28ea4e7f"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest ]; propagatedBuildInputs = [ lanelet2-core mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/galactic/lanelet2-validation/default.nix b/distros/galactic/lanelet2-validation/default.nix index 13654f7f3c..2e38a165b8 100644 --- a/distros/galactic/lanelet2-validation/default.nix +++ b/distros/galactic/lanelet2-validation/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "af1131fe9253eea5b6b8f41aeefc1d4ba7aa3ac5930f46f106659d8ae5584bdf"; }; - buildType = "catkin"; + buildType = "ament_cmake"; checkInputs = [ gtest lanelet2-maps ]; propagatedBuildInputs = [ lanelet2-core lanelet2-io lanelet2-projection lanelet2-routing lanelet2-traffic-rules mrt-cmake-modules ]; nativeBuildInputs = [ ament-cmake-core mrt-cmake-modules ]; diff --git a/distros/galactic/lanelet2/default.nix b/distros/galactic/lanelet2/default.nix index 977f3d8cd9..b9177a77d3 100644 --- a/distros/galactic/lanelet2/default.nix +++ b/distros/galactic/lanelet2/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "7d216e9ff019500f0fe0ad50569491467b40b85fb63f0e36f41d28b1418a30a6"; }; - buildType = "catkin"; + buildType = "ament_cmake"; propagatedBuildInputs = [ lanelet2-core lanelet2-examples lanelet2-io lanelet2-maps lanelet2-projection lanelet2-python lanelet2-routing lanelet2-traffic-rules lanelet2-validation ]; nativeBuildInputs = [ ament-cmake-core ros-environment ]; diff --git a/distros/galactic/lgsvl-msgs/default.nix b/distros/galactic/lgsvl-msgs/default.nix index cbfad719d3..569e06d24a 100644 --- a/distros/galactic/lgsvl-msgs/default.nix +++ b/distros/galactic/lgsvl-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "8e101956bb43b825ba8ab2cc801142f0df5ae1d04a368c1659f73f4aa1fea8ac"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment rosidl-default-generators ]; checkInputs = [ ament-lint-auto ament-lint-common ]; propagatedBuildInputs = [ builtin-interfaces geometry-msgs rosidl-default-runtime sensor-msgs std-msgs ]; diff --git a/distros/galactic/libmavconn/default.nix b/distros/galactic/libmavconn/default.nix index 3e6ed335e3..96693c51dd 100644 --- a/distros/galactic/libmavconn/default.nix +++ b/distros/galactic/libmavconn/default.nix @@ -25,6 +25,6 @@ buildRosPackage { and URL to connection object mapper. This library can be used in standalone programs.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/galactic/libphidget22/default.nix b/distros/galactic/libphidget22/default.nix index 0a28086260..b2b7af7343 100644 --- a/distros/galactic/libphidget22/default.nix +++ b/distros/galactic/libphidget22/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package wraps the libphidget22 to use it as a ROS dependency''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/galactic/magic-enum/default.nix b/distros/galactic/magic-enum/default.nix new file mode 100644 index 0000000000..4f8321305d --- /dev/null +++ b/distros/galactic/magic-enum/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, cmake }: +buildRosPackage { + pname = "ros-galactic-magic-enum"; + version = "0.7.3-r1"; + + src = fetchurl { + url = "https://github.com/nobleo/magic_enum-release/archive/release/galactic/magic_enum/0.7.3-1.tar.gz"; + name = "0.7.3-1.tar.gz"; + sha256 = "b7a5b2ddba201a6238ddbeada09f5eb887711aff17b87f7418f1cb2202aa0eec"; + }; + + buildType = "cmake"; + nativeBuildInputs = [ cmake ]; + + meta = { + description = ''Static reflection for enums (to string, from string, iteration) for modern C++, + work with any enum type without any macro or boilerplate code''; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/distros/galactic/mavlink/default.nix b/distros/galactic/mavlink/default.nix index 82bf90ccc5..02a1e30421 100644 --- a/distros/galactic/mavlink/default.nix +++ b/distros/galactic/mavlink/default.nix @@ -23,6 +23,6 @@ buildRosPackage { for both 1.0 and 2.0 versions of protocol. For pymavlink use separate install via rosdep (python-pymavlink).''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/galactic/mavros-extras/default.nix b/distros/galactic/mavros-extras/default.nix index 078fbe2262..e21e3294ea 100644 --- a/distros/galactic/mavros-extras/default.nix +++ b/distros/galactic/mavros-extras/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Extra nodes and plugins for MAVROS.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/galactic/mavros-msgs/default.nix b/distros/galactic/mavros-msgs/default.nix index 6d2b76f6a4..e07508d2b2 100644 --- a/distros/galactic/mavros-msgs/default.nix +++ b/distros/galactic/mavros-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''mavros_msgs defines messages for MAVROS.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/galactic/mavros/default.nix b/distros/galactic/mavros/default.nix index 31130eff89..50070ddc51 100644 --- a/distros/galactic/mavros/default.nix +++ b/distros/galactic/mavros/default.nix @@ -22,6 +22,6 @@ buildRosPackage { meta = { description = ''MAVROS -- MAVLink extendable communication node for ROS with proxy for Ground Control Station.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/galactic/moveit-servo/default.nix b/distros/galactic/moveit-servo/default.nix index 9b8cccd86f..8610f67d42 100644 --- a/distros/galactic/moveit-servo/default.nix +++ b/distros/galactic/moveit-servo/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Provides real-time manipulator Cartesian and joint servoing.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/nav-2d-msgs/default.nix b/distros/galactic/nav-2d-msgs/default.nix index 94a9630fc8..6b2806d3f7 100644 --- a/distros/galactic/nav-2d-msgs/default.nix +++ b/distros/galactic/nav-2d-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Basic message types for two dimensional navigation, extending from geometry_msgs::Pose2D.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/nav-2d-utils/default.nix b/distros/galactic/nav-2d-utils/default.nix index e4b62d1ad2..1f44d53b88 100644 --- a/distros/galactic/nav-2d-utils/default.nix +++ b/distros/galactic/nav-2d-utils/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''A handful of useful utility functions for nav_2d packages.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/nav2-amcl/default.nix b/distros/galactic/nav2-amcl/default.nix index 26d87b52b3..43b1224024 100644 --- a/distros/galactic/nav2-amcl/default.nix +++ b/distros/galactic/nav2-amcl/default.nix @@ -30,6 +30,6 @@ buildRosPackage { This node is derived, with thanks, from Andrew Howard's excellent 'amcl' Player driver.

''; - license = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-or-later" ]; }; } diff --git a/distros/galactic/nav2-costmap-2d/default.nix b/distros/galactic/nav2-costmap-2d/default.nix index 8ca88d4a3c..4eb7998fc0 100644 --- a/distros/galactic/nav2-costmap-2d/default.nix +++ b/distros/galactic/nav2-costmap-2d/default.nix @@ -27,6 +27,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 = with lib.licenses; [ bsdOriginal asl20 ]; + license = with lib.licenses; [ "BSD-3-Clause" asl20 ]; }; } diff --git a/distros/galactic/nav2-map-server/default.nix b/distros/galactic/nav2-map-server/default.nix index 7725e8482e..477e1ed150 100644 --- a/distros/galactic/nav2-map-server/default.nix +++ b/distros/galactic/nav2-map-server/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Refactored map server for ROS2 Navigation''; - license = with lib.licenses; [ asl20 bsdOriginal ]; + license = with lib.licenses; [ asl20 "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/nav2-navfn-planner/default.nix b/distros/galactic/nav2-navfn-planner/default.nix index eaaafb4a19..6cb97b8e18 100644 --- a/distros/galactic/nav2-navfn-planner/default.nix +++ b/distros/galactic/nav2-navfn-planner/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''TODO''; - license = with lib.licenses; [ asl20 bsdOriginal ]; + license = with lib.licenses; [ asl20 "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/nav2-util/default.nix b/distros/galactic/nav2-util/default.nix index 2397bbe653..3f2002b68f 100644 --- a/distros/galactic/nav2-util/default.nix +++ b/distros/galactic/nav2-util/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''TODO''; - license = with lib.licenses; [ asl20 bsdOriginal ]; + license = with lib.licenses; [ asl20 "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/nav2-voxel-grid/default.nix b/distros/galactic/nav2-voxel-grid/default.nix index 985a53dd0f..22a1b71d22 100644 --- a/distros/galactic/nav2-voxel-grid/default.nix +++ b/distros/galactic/nav2-voxel-grid/default.nix @@ -21,6 +21,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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/nmea-hardware-interface/default.nix b/distros/galactic/nmea-hardware-interface/default.nix index cb707a80ff..5839fc3475 100644 --- a/distros/galactic/nmea-hardware-interface/default.nix +++ b/distros/galactic/nmea-hardware-interface/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''ros2 hardware interface for nmea_gps''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "apache-2.0" ]; }; } diff --git a/distros/galactic/octovis/default.nix b/distros/galactic/octovis/default.nix index 0bb883a3f1..3a30bf2697 100644 --- a/distros/galactic/octovis/default.nix +++ b/distros/galactic/octovis/default.nix @@ -20,6 +20,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 = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/galactic/orocos-kdl/default.nix b/distros/galactic/orocos-kdl/default.nix index 09d0bac9fd..e9f3b59d25 100644 --- a/distros/galactic/orocos-kdl/default.nix +++ b/distros/galactic/orocos-kdl/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''This package contains a recent version of the Kinematics and Dynamics Library (KDL), distributed by the Orocos Project.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/galactic/paho-mqtt-c/default.nix b/distros/galactic/paho-mqtt-c/default.nix new file mode 100644 index 0000000000..27947f3038 --- /dev/null +++ b/distros/galactic/paho-mqtt-c/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, cmake, openssl }: +buildRosPackage { + pname = "ros-galactic-paho-mqtt-c"; + version = "1.3.9-r3"; + + src = fetchurl { + url = "https://github.com/nobleo/paho.mqtt.c-release/archive/release/galactic/paho-mqtt-c/1.3.9-3.tar.gz"; + name = "1.3.9-3.tar.gz"; + sha256 = "b4b2e2af11a7f3eef5e150ea64958d0e37e06f3016565d2c49fd1bc460604347"; + }; + + buildType = "cmake"; + propagatedBuildInputs = [ openssl ]; + nativeBuildInputs = [ cmake ]; + + meta = { + description = ''Eclipse Paho C Client Library for the MQTT Protocol''; + license = with lib.licenses; [ "EPL-2.0" ]; + }; +} diff --git a/distros/galactic/paho-mqtt-cpp/default.nix b/distros/galactic/paho-mqtt-cpp/default.nix new file mode 100644 index 0000000000..62e2ad9d9e --- /dev/null +++ b/distros/galactic/paho-mqtt-cpp/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, cmake, openssl, paho-mqtt-c }: +buildRosPackage { + pname = "ros-galactic-paho-mqtt-cpp"; + version = "1.2.0-r1"; + + src = fetchurl { + url = "https://github.com/nobleo/paho.mqtt.cpp-release/archive/release/galactic/paho-mqtt-cpp/1.2.0-1.tar.gz"; + name = "1.2.0-1.tar.gz"; + sha256 = "415eac652bcfa00e8a8d22efe1d165303c7e0a407d530ac479a7c6615aeb3af0"; + }; + + buildType = "cmake"; + propagatedBuildInputs = [ openssl paho-mqtt-c ]; + nativeBuildInputs = [ cmake ]; + + meta = { + description = ''Eclipse Paho MQTT C++ Client Library''; + license = with lib.licenses; [ "Eclipse-Public-License-v-1.0" ]; + }; +} diff --git a/distros/galactic/phidgets-drivers/default.nix b/distros/galactic/phidgets-drivers/default.nix index 2879fd1989..05165cb426 100644 --- a/distros/galactic/phidgets-drivers/default.nix +++ b/distros/galactic/phidgets-drivers/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''API and ROS drivers for Phidgets devices''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-LGPL" ]; }; } diff --git a/distros/galactic/plotjuggler-ros/default.nix b/distros/galactic/plotjuggler-ros/default.nix index efacd7bcae..e7e0a9459b 100644 --- a/distros/galactic/plotjuggler-ros/default.nix +++ b/distros/galactic/plotjuggler-ros/default.nix @@ -5,20 +5,20 @@ { lib, buildRosPackage, fetchurl, ament-cmake, binutils, boost, diagnostic-msgs, fastcdr, geometry-msgs, nav-msgs, plotjuggler, plotjuggler-msgs, qt5, rclcpp, rcpputils, rosbag2, rosbag2-transport, sensor-msgs, tf2-msgs, tf2-ros }: buildRosPackage { pname = "ros-galactic-plotjuggler-ros"; - version = "1.7.1-r1"; + version = "1.7.3-r1"; src = fetchurl { - url = "https://github.com/PlotJuggler/plotjuggler-ros-plugins-release/archive/release/galactic/plotjuggler_ros/1.7.1-1.tar.gz"; - name = "1.7.1-1.tar.gz"; - sha256 = "fe0e12fd2161ed6100846ebcfe160f37a20e410060f82cda8718d812a5b630cb"; + url = "https://github.com/PlotJuggler/plotjuggler-ros-plugins-release/archive/release/galactic/plotjuggler_ros/1.7.3-1.tar.gz"; + name = "1.7.3-1.tar.gz"; + sha256 = "8a9d372d255c9371cd03373dd89aa3dc829bfc4457cef8d64f7e1baef811e751"; }; - buildType = "catkin"; + buildType = "ament_cmake"; propagatedBuildInputs = [ binutils boost diagnostic-msgs fastcdr geometry-msgs nav-msgs plotjuggler plotjuggler-msgs qt5.qtbase qt5.qtsvg qt5.qtwebsockets rclcpp rcpputils rosbag2 rosbag2-transport sensor-msgs tf2-msgs tf2-ros ]; nativeBuildInputs = [ ament-cmake ]; meta = { description = ''PlotJuggler plugin for ROS''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "AGPLv3" ]; }; } diff --git a/distros/galactic/plotjuggler/default.nix b/distros/galactic/plotjuggler/default.nix index 60ceb1827a..45d8270015 100644 --- a/distros/galactic/plotjuggler/default.nix +++ b/distros/galactic/plotjuggler/default.nix @@ -13,12 +13,12 @@ buildRosPackage { sha256 = "917322dd3b9ef735c0db860c71ff7f3ce09f47cc9dad98b8ddbf4f5d583a223f"; }; - buildType = "catkin"; + buildType = "ament_cmake"; propagatedBuildInputs = [ ament-index-cpp binutils boost cppzmq qt5.qtbase qt5.qtsvg qt5.qtwebsockets qt5.qtx11extras ]; nativeBuildInputs = [ ament-cmake ]; meta = { description = ''PlotJuggler: juggle with data''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/galactic/point-cloud-msg-wrapper/default.nix b/distros/galactic/point-cloud-msg-wrapper/default.nix index 33713f47fa..6018428826 100644 --- a/distros/galactic/point-cloud-msg-wrapper/default.nix +++ b/distros/galactic/point-cloud-msg-wrapper/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "1.0.7-r1"; src = fetchurl { - url = "https://gitlab.com/ApexAI/point_cloud_msg_wrapper-release/-/archive/release/galactic/point_cloud_msg_wrapper/1.0.7-1/point_cloud_msg_wrapper-release-release-galactic-point_cloud_msg_wrapper-1.0.7-1.tar.gz"; - name = "point_cloud_msg_wrapper-release-release-galactic-point_cloud_msg_wrapper-1.0.7-1.tar.gz"; - sha256 = "806dd274522a1260c4201ffd3ccb1d2e8b8fc2ead67c884dd1702eed0bca2007"; + url = "https://gitlab.com/ApexAI/point_cloud_msg_wrapper-release/-/archive/release/galactic/point_cloud_msg_wrapper/1.0.7-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "dce60d50bb7d80f2b9c77e5ddc1697666e647f21b4ccd5df0e198f66610a31a6"; }; buildType = "ament_cmake"; diff --git a/distros/galactic/qpoases-vendor/default.nix b/distros/galactic/qpoases-vendor/default.nix index 34528d35e4..453cd0708f 100644 --- a/distros/galactic/qpoases-vendor/default.nix +++ b/distros/galactic/qpoases-vendor/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Wrapper around qpOASES to make it available to the ROS ecosystem.''; - license = with lib.licenses; [ asl20 lgpl2 ]; + license = with lib.licenses; [ asl20 "LGPL" ]; }; } diff --git a/distros/galactic/rcpputils/default.nix b/distros/galactic/rcpputils/default.nix index 7a1de7c7f4..4f2b5dded1 100644 --- a/distros/galactic/rcpputils/default.nix +++ b/distros/galactic/rcpputils/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Package containing utility code for C++.''; - license = with lib.licenses; [ asl20 bsdOriginal ]; + license = with lib.licenses; [ asl20 "BSD-3-Clause" ]; }; } diff --git a/distros/galactic/realsense2-camera-msgs/default.nix b/distros/galactic/realsense2-camera-msgs/default.nix index ea10f672fc..0cfb161f93 100644 --- a/distros/galactic/realsense2-camera-msgs/default.nix +++ b/distros/galactic/realsense2-camera-msgs/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-common, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-galactic-realsense2-camera-msgs"; - version = "4.0.2-r1"; + version = "4.0.4-r1"; src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/galactic/realsense2_camera_msgs/4.0.2-1.tar.gz"; - name = "4.0.2-1.tar.gz"; - sha256 = "298487e94d36a4b0b6ae67483c39613ff90888ff4ba6771a3824f3e44326b16c"; + url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/galactic/realsense2_camera_msgs/4.0.4-1.tar.gz"; + name = "4.0.4-1.tar.gz"; + sha256 = "810d61b3c9b681315aa1ee879e98068cfd26c055c9553dba64c8d0ac37e7da95"; }; buildType = "ament_cmake"; @@ -19,7 +19,7 @@ buildRosPackage { nativeBuildInputs = [ ament-cmake rosidl-default-generators ]; meta = { - description = ''A package containing realsense camera messages definitions.''; + description = ''RealSense camera_msgs package containing realsense camera messages definitions''; license = with lib.licenses; [ asl20 ]; }; } diff --git a/distros/galactic/realsense2-camera/default.nix b/distros/galactic/realsense2-camera/default.nix index 81acf8c41a..a2eb231559 100644 --- a/distros/galactic/realsense2-camera/default.nix +++ b/distros/galactic/realsense2-camera/default.nix @@ -2,25 +2,25 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, builtin-interfaces, cv-bridge, diagnostic-updater, eigen, geometry-msgs, image-transport, launch-ros, librealsense2, opencv3, rclcpp, rclcpp-components, realsense2-camera-msgs, ros-environment, sensor-msgs, std-msgs, tf2, tf2-ros }: +{ lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, builtin-interfaces, cv-bridge, diagnostic-updater, eigen, geometry-msgs, image-transport, launch-ros, librealsense2, nav-msgs, opencv3, rclcpp, rclcpp-components, realsense2-camera-msgs, ros-environment, sensor-msgs, std-msgs, tf2, tf2-ros }: buildRosPackage { pname = "ros-galactic-realsense2-camera"; - version = "4.0.2-r1"; + version = "4.0.4-r1"; src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/galactic/realsense2_camera/4.0.2-1.tar.gz"; - name = "4.0.2-1.tar.gz"; - sha256 = "5c9d2bbffef3a4992fbed45c4d792bd61765b153d233a09c07fa20ee0d4c0e4b"; + url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/galactic/realsense2_camera/4.0.4-1.tar.gz"; + name = "4.0.4-1.tar.gz"; + sha256 = "0eafa4bd8bfa8c05db3d42e8c31ebbcb8301d1482a492ae26c6e9f11e1b0e65a"; }; buildType = "ament_cmake"; buildInputs = [ ros-environment ]; checkInputs = [ ament-cmake-gtest ament-lint-auto ament-lint-common opencv3 ]; - propagatedBuildInputs = [ builtin-interfaces cv-bridge diagnostic-updater eigen geometry-msgs image-transport launch-ros librealsense2 rclcpp rclcpp-components realsense2-camera-msgs sensor-msgs std-msgs tf2 tf2-ros ]; + propagatedBuildInputs = [ builtin-interfaces cv-bridge diagnostic-updater eigen geometry-msgs image-transport launch-ros librealsense2 nav-msgs rclcpp rclcpp-components realsense2-camera-msgs sensor-msgs std-msgs tf2 tf2-ros ]; nativeBuildInputs = [ ament-cmake ]; meta = { - description = ''RealSense Camera package allowing access to Intel T265 Tracking module and SR300 and D400 3D cameras''; + description = ''RealSense camera package allowing access to Intel T265 Tracking module and SR300 and D400 3D cameras''; license = with lib.licenses; [ asl20 ]; }; } diff --git a/distros/galactic/realsense2-description/default.nix b/distros/galactic/realsense2-description/default.nix index 24f1954024..32caadd817 100644 --- a/distros/galactic/realsense2-description/default.nix +++ b/distros/galactic/realsense2-description/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, launch-ros, rclcpp, rclcpp-components, realsense2-camera-msgs, xacro }: buildRosPackage { pname = "ros-galactic-realsense2-description"; - version = "4.0.2-r1"; + version = "4.0.4-r1"; src = fetchurl { - url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/galactic/realsense2_description/4.0.2-1.tar.gz"; - name = "4.0.2-1.tar.gz"; - sha256 = "9e88417662b028d54f04ec4c4a3366ed519ad2c96400c07a556833082048fa1e"; + url = "https://github.com/IntelRealSense/realsense-ros-release/archive/release/galactic/realsense2_description/4.0.4-1.tar.gz"; + name = "4.0.4-1.tar.gz"; + sha256 = "254818d0883d8d32747a1d178af05f9da1a7aed8fddef846fec6f24ef5ef1612"; }; buildType = "ament_cmake"; @@ -19,7 +19,7 @@ buildRosPackage { nativeBuildInputs = [ ament-cmake ]; meta = { - description = ''RealSense Camera description package for Intel 3D D400 cameras''; + description = ''RealSense description package for Intel 3D D400 cameras''; license = with lib.licenses; [ asl20 ]; }; } diff --git a/distros/galactic/rmf-demos-tasks/default.nix b/distros/galactic/rmf-demos-tasks/default.nix index e0f2974e82..bf010afb5c 100644 --- a/distros/galactic/rmf-demos-tasks/default.nix +++ b/distros/galactic/rmf-demos-tasks/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''A package containing scripts for demos''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "Apache-Licence-2.0" ]; }; } diff --git a/distros/galactic/rqt-image-overlay-layer/default.nix b/distros/galactic/rqt-image-overlay-layer/default.nix index b96d8c73a0..97786dabd7 100644 --- a/distros/galactic/rqt-image-overlay-layer/default.nix +++ b/distros/galactic/rqt-image-overlay-layer/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-lint-auto, ament-lint-common, message-filters, pluginlib, qt5, rclcpp, rcpputils, rosidl-runtime-cpp }: buildRosPackage { pname = "ros-galactic-rqt-image-overlay-layer"; - version = "0.0.4-r1"; + version = "0.0.5-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_image_overlay-release/archive/release/galactic/rqt_image_overlay_layer/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "3c66b2074b6921a2ba521db9bb2a821168ddd3cea9dfa87493e532543d9edb20"; + url = "https://github.com/ros2-gbp/rqt_image_overlay-release/archive/release/galactic/rqt_image_overlay_layer/0.0.5-1.tar.gz"; + name = "0.0.5-1.tar.gz"; + sha256 = "0ca4c5fa2eb66e86e9b72004315fbab5d487a09317a2f7eb93c195b9bbba8598"; }; buildType = "ament_cmake"; diff --git a/distros/galactic/rqt-image-overlay/default.nix b/distros/galactic/rqt-image-overlay/default.nix index 9bce754f56..adfea74803 100644 --- a/distros/galactic/rqt-image-overlay/default.nix +++ b/distros/galactic/rqt-image-overlay/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, image-transport, pluginlib, qt5, rclcpp, ros-image-to-qimage, rqt-gui-cpp, rqt-image-overlay-layer, std-msgs, theora-image-transport }: buildRosPackage { pname = "ros-galactic-rqt-image-overlay"; - version = "0.0.4-r1"; + version = "0.0.5-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_image_overlay-release/archive/release/galactic/rqt_image_overlay/0.0.4-1.tar.gz"; - name = "0.0.4-1.tar.gz"; - sha256 = "f38f3cfae30ff105182072deaab7bcc4705184d730ab7908724e9b68f858fa88"; + url = "https://github.com/ros2-gbp/rqt_image_overlay-release/archive/release/galactic/rqt_image_overlay/0.0.5-1.tar.gz"; + name = "0.0.5-1.tar.gz"; + sha256 = "b6294f9c8499d264f7fc8eafe337b19fda0a38c256377dfee617beb07779acfb"; }; buildType = "ament_cmake"; diff --git a/distros/galactic/rqt-robot-monitor/default.nix b/distros/galactic/rqt-robot-monitor/default.nix index 9ab4c77e86..fdbff049e9 100644 --- a/distros/galactic/rqt-robot-monitor/default.nix +++ b/distros/galactic/rqt-robot-monitor/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, diagnostic-msgs, python-qt-binding, python3Packages, qt-gui, qt-gui-py-common, rclpy, rosidl-default-generators, rqt-gui, rqt-gui-py, rqt-py-common }: buildRosPackage { pname = "ros-galactic-rqt-robot-monitor"; - version = "1.0.4-r2"; + version = "1.0.5-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/rqt_robot_monitor-release/archive/release/galactic/rqt_robot_monitor/1.0.4-2.tar.gz"; - name = "1.0.4-2.tar.gz"; - sha256 = "81161e8aeb5313bcc6197f3733d1943e4eff27fd5cfcd809819938b83178b38c"; + url = "https://github.com/ros2-gbp/rqt_robot_monitor-release/archive/release/galactic/rqt_robot_monitor/1.0.5-1.tar.gz"; + name = "1.0.5-1.tar.gz"; + sha256 = "0e8191271ede5ce8c337484c23868e504ddb7dd99dc13714552cd0300b2c324b"; }; buildType = "ament_python"; diff --git a/distros/galactic/rslidar-sdk/default.nix b/distros/galactic/rslidar-sdk/default.nix index 5afdebc225..1918e9aa69 100644 --- a/distros/galactic/rslidar-sdk/default.nix +++ b/distros/galactic/rslidar-sdk/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake, libpcap, libyamlcpp, pcl, pcl-conversions, rclcpp, rslidar-msg, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-galactic-rslidar-sdk"; - version = "1.3.0-r3"; + version = "1.3.2-r1"; src = fetchurl { - url = "https://github.com/nobleo/rslidar_sdk-release/archive/release/galactic/rslidar_sdk/1.3.0-3.tar.gz"; - name = "1.3.0-3.tar.gz"; - sha256 = "21260a72a9bcb828f69ed28a80b013c25f3221105d9c1a05e98b84a8ec09663b"; + url = "https://github.com/nobleo/rslidar_sdk-release/archive/release/galactic/rslidar_sdk/1.3.2-1.tar.gz"; + name = "1.3.2-1.tar.gz"; + sha256 = "a0299c63831f8e4a89abbc0f8cd57c0d64bbf0948aaa4570777004c138709247"; }; buildType = "ament_cmake"; diff --git a/distros/galactic/serial-driver/default.nix b/distros/galactic/serial-driver/default.nix index 26b90dbf7d..f80f2ccc15 100644 --- a/distros/galactic/serial-driver/default.nix +++ b/distros/galactic/serial-driver/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake-auto, ament-cmake-gtest, ament-lint-auto, ament-lint-common, asio, asio-cmake-module, io-context, rclcpp, rclcpp-components, rclcpp-lifecycle, std-msgs }: buildRosPackage { pname = "ros-galactic-serial-driver"; - version = "1.0.1-r1"; + version = "1.1.1-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/galactic/serial_driver/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "29d76b7fcd85d37ee47af9c38ce7211db07780d9cae023816c898c2cf465bc1b"; + url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/galactic/serial_driver/1.1.1-1.tar.gz"; + name = "1.1.1-1.tar.gz"; + sha256 = "df73e27af3fb178e836c6c9b1bd746676b72b664768798842f85097736e94b8d"; }; buildType = "ament_cmake"; diff --git a/distros/galactic/slam-toolbox/default.nix b/distros/galactic/slam-toolbox/default.nix index 258630e7dc..da00d6f764 100644 --- a/distros/galactic/slam-toolbox/default.nix +++ b/distros/galactic/slam-toolbox/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package provides a sped up improved slam karto with updated SDK and visualization and modification toolsets''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/galactic/slider-publisher/default.nix b/distros/galactic/slider-publisher/default.nix new file mode 100644 index 0000000000..ac377a7708 --- /dev/null +++ b/distros/galactic/slider-publisher/default.nix @@ -0,0 +1,23 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, rqt-gui-py }: +buildRosPackage { + pname = "ros-galactic-slider-publisher"; + version = "2.1.0-r1"; + + src = fetchurl { + url = "https://github.com/oKermorgant/slider_publisher-release/archive/release/galactic/slider_publisher/2.1.0-1.tar.gz"; + name = "2.1.0-1.tar.gz"; + sha256 = "525137f72228fdee500deeef844d9271be4c543c5442fd7e5107d3d67143ca20"; + }; + + buildType = "ament_python"; + propagatedBuildInputs = [ rqt-gui-py ]; + + meta = { + description = ''This packages proposes a slider-based publisher node similar to the joint_state_publisher, but that can publish any type of message.''; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/distros/galactic/spatio-temporal-voxel-layer/default.nix b/distros/galactic/spatio-temporal-voxel-layer/default.nix index be85d07da5..008077d00e 100644 --- a/distros/galactic/spatio-temporal-voxel-layer/default.nix +++ b/distros/galactic/spatio-temporal-voxel-layer/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''The spatio-temporal 3D obstacle costmap package''; - license = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-only" ]; }; } diff --git a/distros/galactic/tango-icons-vendor/default.nix b/distros/galactic/tango-icons-vendor/default.nix index cbc5e2acf3..4dcf1dfd7f 100644 --- a/distros/galactic/tango-icons-vendor/default.nix +++ b/distros/galactic/tango-icons-vendor/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''tango_icons_vendor provides the public domain Tango icons for non-linux systems (Tango Icon Library) from the Tango Desktop Project''; - license = with lib.licenses; [ asl20 publicDomain ]; + license = with lib.licenses; [ asl20 "PD" ]; }; } diff --git a/distros/galactic/teleop-twist-keyboard/default.nix b/distros/galactic/teleop-twist-keyboard/default.nix index 974d98a5c5..744802598a 100644 --- a/distros/galactic/teleop-twist-keyboard/default.nix +++ b/distros/galactic/teleop-twist-keyboard/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''A robot-agnostic teleoperation node to convert keyboard commands to Twist messages.''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-License-2.0" ]; }; } diff --git a/distros/galactic/tlsf-cpp/default.nix b/distros/galactic/tlsf-cpp/default.nix index 381fb171cf..c351f9b733 100644 --- a/distros/galactic/tlsf-cpp/default.nix +++ b/distros/galactic/tlsf-cpp/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''C++ stdlib-compatible wrapper around tlsf allocator and ROS2 examples''; - license = with lib.licenses; [ lgpl21 asl20 ]; + license = with lib.licenses; [ "LGPL-2.1-only" asl20 ]; }; } diff --git a/distros/galactic/tlsf/default.nix b/distros/galactic/tlsf/default.nix index 66ed08bffe..9f2893b745 100644 --- a/distros/galactic/tlsf/default.nix +++ b/distros/galactic/tlsf/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''TLSF allocator version 2.4.6''; - license = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-only" ]; }; } diff --git a/distros/galactic/topic-tools-interfaces/default.nix b/distros/galactic/topic-tools-interfaces/default.nix new file mode 100644 index 0000000000..17f9d84c95 --- /dev/null +++ b/distros/galactic/topic-tools-interfaces/default.nix @@ -0,0 +1,26 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake-auto, ament-lint-auto, ament-lint-common, builtin-interfaces, rosidl-default-generators, rosidl-default-runtime }: +buildRosPackage { + pname = "ros-galactic-topic-tools-interfaces"; + version = "1.0.0-r1"; + + src = fetchurl { + url = "https://github.com/ros2-gbp/topic_tools-release/archive/release/galactic/topic_tools_interfaces/1.0.0-1.tar.gz"; + name = "1.0.0-1.tar.gz"; + sha256 = "f7e957180a7ade596673a858dfc6a281cc2fe31bed571f9ac9201c96e1c789c1"; + }; + + buildType = "ament_cmake"; + buildInputs = [ rosidl-default-generators ]; + checkInputs = [ ament-lint-auto ament-lint-common ]; + propagatedBuildInputs = [ builtin-interfaces rosidl-default-runtime ]; + nativeBuildInputs = [ ament-cmake-auto ]; + + meta = { + description = ''topic_tools_interfaces contains messages and services for topic_tools''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/galactic/topic-tools/default.nix b/distros/galactic/topic-tools/default.nix new file mode 100644 index 0000000000..d3147f6d65 --- /dev/null +++ b/distros/galactic/topic-tools/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, ament-cmake-auto, ament-cmake-python, ament-lint-auto, ament-lint-common, rclcpp, rclcpp-components, rclpy, ros2cli, rosidl-default-generators, rosidl-runtime-py, topic-tools-interfaces }: +buildRosPackage { + pname = "ros-galactic-topic-tools"; + version = "1.0.0-r1"; + + src = fetchurl { + url = "https://github.com/ros2-gbp/topic_tools-release/archive/release/galactic/topic_tools/1.0.0-1.tar.gz"; + name = "1.0.0-1.tar.gz"; + sha256 = "6e56bb47916f83e2251b9a2b509462a9b5df5a8e4cb1bf21b28191dd1fe6542f"; + }; + + buildType = "ament_cmake"; + checkInputs = [ ament-lint-auto ament-lint-common ]; + propagatedBuildInputs = [ rclcpp rclcpp-components rclpy ros2cli rosidl-runtime-py topic-tools-interfaces ]; + nativeBuildInputs = [ ament-cmake-auto ament-cmake-python rosidl-default-generators ]; + + meta = { + description = ''TODO: Package description''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/galactic/tvm-vendor/default.nix b/distros/galactic/tvm-vendor/default.nix index 6cfc604739..73ccdd723e 100644 --- a/distros/galactic/tvm-vendor/default.nix +++ b/distros/galactic/tvm-vendor/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "b42ffb4f9599de069dba6659c059602069adbe36ac4a1ac356b1f013120328be"; }; - buildType = "catkin"; + buildType = "ament_cmake"; buildInputs = [ ros-environment ]; propagatedBuildInputs = [ git libxml2 openblas spirv-headers spirv-tools vulkan-loader ]; nativeBuildInputs = [ ament-cmake ]; diff --git a/distros/galactic/udp-driver/default.nix b/distros/galactic/udp-driver/default.nix index 4c220f6c50..aa6e3526fe 100644 --- a/distros/galactic/udp-driver/default.nix +++ b/distros/galactic/udp-driver/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake-auto, ament-cmake-gtest, ament-lint-auto, ament-lint-common, asio, asio-cmake-module, io-context, lifecycle-msgs, rclcpp, rclcpp-components, rclcpp-lifecycle, std-msgs, udp-msgs }: buildRosPackage { pname = "ros-galactic-udp-driver"; - version = "1.0.1-r1"; + version = "1.1.1-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/galactic/udp_driver/1.0.1-1.tar.gz"; - name = "1.0.1-1.tar.gz"; - sha256 = "c0832f450e2aebabfce86df050e1b5453f3008a511d7d6ad6411f4c47e811fca"; + url = "https://github.com/ros2-gbp/transport_drivers-release/archive/release/galactic/udp_driver/1.1.1-1.tar.gz"; + name = "1.1.1-1.tar.gz"; + sha256 = "a8db46b11f9368828d770dde8118732da8ce7c4363cb370eec2145c7cc56ab04"; }; buildType = "ament_cmake"; diff --git a/distros/galactic/uncrustify-vendor/default.nix b/distros/galactic/uncrustify-vendor/default.nix index bc5d7ac0c0..a1a57ebfcb 100644 --- a/distros/galactic/uncrustify-vendor/default.nix +++ b/distros/galactic/uncrustify-vendor/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Wrapper around uncrustify, providing nothing but a dependency on uncrustify, on some systems. On others, it provides an ExternalProject build of uncrustify.''; - license = with lib.licenses; [ asl20 gpl2 ]; + license = with lib.licenses; [ asl20 "GPL-2.0-only" ]; }; } diff --git a/distros/galactic/ur-client-library/default.nix b/distros/galactic/ur-client-library/default.nix index 013e9f624d..5f4c5928cf 100644 --- a/distros/galactic/ur-client-library/default.nix +++ b/distros/galactic/ur-client-library/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Standalone C++ library for accessing Universal Robots interfaces. This has been forked off the ur_robot_driver.''; - license = with lib.licenses; [ asl20 bsd2 "Zlib" mit ]; + license = with lib.licenses; [ asl20 "BSD-2-Clause" "Zlib" mit ]; }; } diff --git a/distros/galactic/vision-msgs/default.nix b/distros/galactic/vision-msgs/default.nix index c392617c0d..211182961a 100644 --- a/distros/galactic/vision-msgs/default.nix +++ b/distros/galactic/vision-msgs/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, ament-cmake, ament-cmake-gtest, ament-lint-auto, ament-lint-common, geometry-msgs, rosidl-default-generators, rosidl-default-runtime, std-msgs }: buildRosPackage { pname = "ros-galactic-vision-msgs"; - version = "3.0.1-r1"; + version = "3.0.2-r1"; src = fetchurl { - url = "https://github.com/ros2-gbp/vision_msgs-release/archive/release/galactic/vision_msgs/3.0.1-1.tar.gz"; - name = "3.0.1-1.tar.gz"; - sha256 = "0d88b18a42337465c8bd4a4967505d7bc868e892011e6a9725d5d32d331997a0"; + url = "https://github.com/ros2-gbp/vision_msgs-release/archive/release/galactic/vision_msgs/3.0.2-1.tar.gz"; + name = "3.0.2-1.tar.gz"; + sha256 = "ca40e7eb3a726fb8f7a0b2bbe40a6b85f75afb70a9393106c9a9b80599aca6ea"; }; buildType = "ament_cmake"; diff --git a/distros/galactic/visp/default.nix b/distros/galactic/visp/default.nix index d3adcf3947..635f23815f 100644 --- a/distros/galactic/visp/default.nix +++ b/distros/galactic/visp/default.nix @@ -29,6 +29,6 @@ buildRosPackage { ViSP can be useful in robotics, computer vision, augmented reality and computer animation.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/galactic/wiimote/default.nix b/distros/galactic/wiimote/default.nix index c704d2b8ea..ea1488fbf0 100644 --- a/distros/galactic/wiimote/default.nix +++ b/distros/galactic/wiimote/default.nix @@ -28,6 +28,6 @@ buildRosPackage { nodes to control the Wiimote's LEDs and vibration for feedback to the human Wiimote operator. LEDs and vibration may be switched on and off, or made to operate according to a timed pattern.''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/abb-egm-msgs/default.nix b/distros/melodic/abb-egm-msgs/default.nix index f240ff3f2c..771474af15 100644 --- a/distros/melodic/abb-egm-msgs/default.nix +++ b/distros/melodic/abb-egm-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Provides ROS message definitions, representing Externally Guided Motion (EGM) data from ABB robot controllers.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/abb-rapid-msgs/default.nix b/distros/melodic/abb-rapid-msgs/default.nix index d08e7b7f30..1f247db884 100644 --- a/distros/melodic/abb-rapid-msgs/default.nix +++ b/distros/melodic/abb-rapid-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Provides ROS message definitions, representing RAPID data from ABB robot controllers.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/abb-rapid-sm-addin-msgs/default.nix b/distros/melodic/abb-rapid-sm-addin-msgs/default.nix index 73fc0ed4d7..2192cc806d 100644 --- a/distros/melodic/abb-rapid-sm-addin-msgs/default.nix +++ b/distros/melodic/abb-rapid-sm-addin-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Provides ROS message and service definitions, representing interaction with ABB robot controllers using the RobotWare StateMachine Add-In.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/abb-robot-msgs/default.nix b/distros/melodic/abb-robot-msgs/default.nix index da87dad445..e3cedfb992 100644 --- a/distros/melodic/abb-robot-msgs/default.nix +++ b/distros/melodic/abb-robot-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Provides ROS message and service definitions, representing basic interaction with ABB robot controllers.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/abseil-cpp/default.nix b/distros/melodic/abseil-cpp/default.nix index 68ac79ef91..a7850ee104 100644 --- a/distros/melodic/abseil-cpp/default.nix +++ b/distros/melodic/abseil-cpp/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The abseil_cpp package''; - license = with lib.licenses; [ "Apache-1.0" ]; + license = with lib.licenses; [ "Apache" ]; }; } diff --git a/distros/melodic/acado/default.nix b/distros/melodic/acado/default.nix index 1a3e6475f9..a104d800d8 100644 --- a/distros/melodic/acado/default.nix +++ b/distros/melodic/acado/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ACADO Toolkit''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/amcl/default.nix b/distros/melodic/amcl/default.nix index bbbc5fcaa9..5cc7ff468b 100644 --- a/distros/melodic/amcl/default.nix +++ b/distros/melodic/amcl/default.nix @@ -30,6 +30,6 @@ buildRosPackage { This node is derived, with thanks, from Andrew Howard's excellent 'amcl' Player driver.

''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/apriltag-ros/default.nix b/distros/melodic/apriltag-ros/default.nix index f6c87ce88e..a56b5223c3 100644 --- a/distros/melodic/apriltag-ros/default.nix +++ b/distros/melodic/apriltag-ros/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, apriltag, catkin, cmake-modules, cv-bridge, eigen, geometry-msgs, image-geometry, image-transport, message-generation, message-runtime, nodelet, opencv3, pluginlib, roscpp, sensor-msgs, std-msgs, tf }: buildRosPackage { pname = "ros-melodic-apriltag-ros"; - version = "3.1.2-r1"; + version = "3.2.0-r1"; src = fetchurl { - url = "https://github.com/AprilRobotics/apriltag_ros-release/archive/release/melodic/apriltag_ros/3.1.2-1.tar.gz"; - name = "3.1.2-1.tar.gz"; - sha256 = "e30c59625ea64099fb38dab357f142b0182926b860615128e7e0a5f0d0948c39"; + url = "https://github.com/AprilRobotics/apriltag_ros-release/archive/release/melodic/apriltag_ros/3.2.0-1.tar.gz"; + name = "3.2.0-1.tar.gz"; + sha256 = "a309e7dc7f6febb4aa237c98d3be84bf476331102064b5b8f2cbace1c50b5faf"; }; buildType = "catkin"; diff --git a/distros/melodic/apriltag/default.nix b/distros/melodic/apriltag/default.nix index 0a6abf00de..6998d2b869 100644 --- a/distros/melodic/apriltag/default.nix +++ b/distros/melodic/apriltag/default.nix @@ -2,18 +2,19 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, cmake }: +{ lib, buildRosPackage, fetchurl, cmake, opencv3 }: buildRosPackage { pname = "ros-melodic-apriltag"; - version = "3.1.6-r1"; + version = "3.2.0-r1"; src = fetchurl { - url = "https://github.com/AprilRobotics/apriltag-release/archive/release/melodic/apriltag/3.1.6-1.tar.gz"; - name = "3.1.6-1.tar.gz"; - sha256 = "05db2d6bcfd95576934394d1a48ec40d28db5dff78e44ecdf11da740c48ddd44"; + url = "https://github.com/AprilRobotics/apriltag-release/archive/release/melodic/apriltag/3.2.0-1.tar.gz"; + name = "3.2.0-1.tar.gz"; + sha256 = "178768b9e7b4523d3c4bd5b6974618fcdad4948cd1653264a0cfe90e4f114f9c"; }; buildType = "cmake"; + checkInputs = [ opencv3 ]; nativeBuildInputs = [ cmake ]; meta = { diff --git a/distros/melodic/ar-track-alvar/default.nix b/distros/melodic/ar-track-alvar/default.nix index dfa96124e7..fa45e091c6 100644 --- a/distros/melodic/ar-track-alvar/default.nix +++ b/distros/melodic/ar-track-alvar/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''This package is a ROS wrapper for Alvar, an open source AR tag tracking library.''; - license = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-only" ]; }; } diff --git a/distros/melodic/assimp-devel/default.nix b/distros/melodic/assimp-devel/default.nix index 034f3a4159..c74a74cae9 100644 --- a/distros/melodic/assimp-devel/default.nix +++ b/distros/melodic/assimp-devel/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''assimp library''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/ati-force-torque/default.nix b/distros/melodic/ati-force-torque/default.nix index 6fbbf0e486..cc03196062 100644 --- a/distros/melodic/ati-force-torque/default.nix +++ b/distros/melodic/ati-force-torque/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''This package implements driver for ATI force torque sensors up to firmware 3.x. Char and Net CAN devices are supported through cob_generic_can package. The code if based on cob_forcetorque package.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/baldor/default.nix b/distros/melodic/baldor/default.nix index 3c366c8433..47f1767c7f 100644 --- a/distros/melodic/baldor/default.nix +++ b/distros/melodic/baldor/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The baldor package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/bfl/default.nix b/distros/melodic/bfl/default.nix index c0d0bcdf1d..3054f9a64f 100644 --- a/distros/melodic/bfl/default.nix +++ b/distros/melodic/bfl/default.nix @@ -27,6 +27,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 = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/bota-driver-testing/default.nix b/distros/melodic/bota-driver-testing/default.nix index 6e6719f820..68f058a6f8 100644 --- a/distros/melodic/bota-driver-testing/default.nix +++ b/distros/melodic/bota-driver-testing/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r1"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/bota_driver_testing/0.6.1-1/bota_driver-release-release-melodic-bota_driver_testing-0.6.1-1.tar.gz"; - name = "bota_driver-release-release-melodic-bota_driver_testing-0.6.1-1.tar.gz"; - sha256 = "66542da7abaf7112dedfb4b4e2710ec8b6e0ed9896174de95ddf66c9ea08be12"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/bota_driver_testing/0.6.1-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "e046206fae92a78bc743d1dfd1acb1116e904932ab1c9b54998eeb47f3358b59"; }; buildType = "catkin"; diff --git a/distros/melodic/bota-driver/default.nix b/distros/melodic/bota-driver/default.nix index cad37b642e..86ff244d6b 100644 --- a/distros/melodic/bota-driver/default.nix +++ b/distros/melodic/bota-driver/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r1"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/bota_driver/0.6.1-1/bota_driver-release-release-melodic-bota_driver-0.6.1-1.tar.gz"; - name = "bota_driver-release-release-melodic-bota_driver-0.6.1-1.tar.gz"; - sha256 = "10cfcffc756323213907bc58cecf3d803efc65e7b8f18e6186d76ac5b9ee5d7d"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/bota_driver/0.6.1-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "2a892e15b77112808b1f0bf39de71906a8848b524c4ee004081ac15af897c3e0"; }; buildType = "catkin"; diff --git a/distros/melodic/bota-node/default.nix b/distros/melodic/bota-node/default.nix index ea315d6136..df01d5a5f2 100644 --- a/distros/melodic/bota-node/default.nix +++ b/distros/melodic/bota-node/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r1"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/bota_node/0.6.1-1/bota_driver-release-release-melodic-bota_node-0.6.1-1.tar.gz"; - name = "bota_driver-release-release-melodic-bota_node-0.6.1-1.tar.gz"; - sha256 = "723de28331c1bd06644ed12ed30f6b76726976646dedd0886668d53d4ad3e251"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/bota_node/0.6.1-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "dede399d53a9a4623ebcb5bd09a83c293d2d33c2fcaf526b2f9dbac818100c4c"; }; buildType = "catkin"; diff --git a/distros/melodic/bota-signal-handler/default.nix b/distros/melodic/bota-signal-handler/default.nix index 3ee2a0b732..b9fabaddb0 100644 --- a/distros/melodic/bota-signal-handler/default.nix +++ b/distros/melodic/bota-signal-handler/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r1"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/bota_signal_handler/0.6.1-1/bota_driver-release-release-melodic-bota_signal_handler-0.6.1-1.tar.gz"; - name = "bota_driver-release-release-melodic-bota_signal_handler-0.6.1-1.tar.gz"; - sha256 = "bd544d86c3b6fb896fccd1dd079ec588a3d50afd6577c1299c7eabe9bec020ca"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/bota_signal_handler/0.6.1-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "c5499547fd6656c589b3828a82a59175a8b56726f5126b6cb9cad62f9be0b562"; }; buildType = "catkin"; diff --git a/distros/melodic/bota-worker/default.nix b/distros/melodic/bota-worker/default.nix index 9279ea678f..1d17d9e539 100644 --- a/distros/melodic/bota-worker/default.nix +++ b/distros/melodic/bota-worker/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r1"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/bota_worker/0.6.1-1/bota_driver-release-release-melodic-bota_worker-0.6.1-1.tar.gz"; - name = "bota_driver-release-release-melodic-bota_worker-0.6.1-1.tar.gz"; - sha256 = "a96fd54d4e69bafbb3151b8126d2abf51a7d515663019713cdacacf5ce14f0b6"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/bota_worker/0.6.1-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "9ff2f67d4f0bebdcd1dcc92472e784e3b3b79e45fa28d75599fc532bd87d8bab"; }; buildType = "catkin"; diff --git a/distros/melodic/camera-umd/default.nix b/distros/melodic/camera-umd/default.nix index 5c166c9350..cbedbc1019 100644 --- a/distros/melodic/camera-umd/default.nix +++ b/distros/melodic/camera-umd/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''UMD camera metapackage''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/melodic/canopen-402/default.nix b/distros/melodic/canopen-402/default.nix index 3269a06232..455958a494 100644 --- a/distros/melodic/canopen-402/default.nix +++ b/distros/melodic/canopen-402/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This implements the CANopen device profile for drives and motion control. CiA(r) 402''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/canopen-chain-node/default.nix b/distros/melodic/canopen-chain-node/default.nix index bc11a0fe5c..82bf188cbf 100644 --- a/distros/melodic/canopen-chain-node/default.nix +++ b/distros/melodic/canopen-chain-node/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Base implementation for CANopen chains node with support for management services and diagnostics''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/canopen-master/default.nix b/distros/melodic/canopen-master/default.nix index 13ac529867..0dd0e426ee 100644 --- a/distros/melodic/canopen-master/default.nix +++ b/distros/melodic/canopen-master/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''CiA(r) CANopen 301 master implementation with support for interprocess master synchronisation.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/canopen-motor-node/default.nix b/distros/melodic/canopen-motor-node/default.nix index fc137bf940..4387f67aa7 100644 --- a/distros/melodic/canopen-motor-node/default.nix +++ b/distros/melodic/canopen-motor-node/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''canopen_chain_node specialization for handling of canopen_402 motor devices. It facilitates interface abstraction with ros_control.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/catkin-virtualenv/default.nix b/distros/melodic/catkin-virtualenv/default.nix index a1a589f7ec..d6e877276f 100644 --- a/distros/melodic/catkin-virtualenv/default.nix +++ b/distros/melodic/catkin-virtualenv/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Bundle python requirements in a catkin package via virtualenv.''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/cob-extern/default.nix b/distros/melodic/cob-extern/default.nix index 135b1620dd..6d6ccce4ab 100644 --- a/distros/melodic/cob-extern/default.nix +++ b/distros/melodic/cob-extern/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The cob_extern stack contains third party libraries needed for operating Care-O-bot. The packages are downloaded from the manufactorers website and not changed in any way.''; - license = with lib.licenses; [ lgpl2 "proprietary" ]; + license = with lib.licenses; [ "LGPL" "Proprietary" ]; }; } diff --git a/distros/melodic/copernicus-base/default.nix b/distros/melodic/copernicus-base/default.nix index 9046522955..3910e4fcff 100644 --- a/distros/melodic/copernicus-base/default.nix +++ b/distros/melodic/copernicus-base/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The copernicus_base package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/copernicus-control/default.nix b/distros/melodic/copernicus-control/default.nix index 6b1bc2d3d3..99ca6fb5a3 100644 --- a/distros/melodic/copernicus-control/default.nix +++ b/distros/melodic/copernicus-control/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The copernicus_control package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/copernicus-description/default.nix b/distros/melodic/copernicus-description/default.nix index 97d3c5ba50..e8d27757b6 100644 --- a/distros/melodic/copernicus-description/default.nix +++ b/distros/melodic/copernicus-description/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The copernicus_description package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/copernicus-localization/default.nix b/distros/melodic/copernicus-localization/default.nix index 73ef0c49b6..0971de1a4c 100644 --- a/distros/melodic/copernicus-localization/default.nix +++ b/distros/melodic/copernicus-localization/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The copernicus_localization package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/copernicus-msgs/default.nix b/distros/melodic/copernicus-msgs/default.nix index 3a15c2eabe..da50367be1 100644 --- a/distros/melodic/copernicus-msgs/default.nix +++ b/distros/melodic/copernicus-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The copernicus_msgs package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/copernicus-navigation/default.nix b/distros/melodic/copernicus-navigation/default.nix index 198462882d..de3a1e219e 100644 --- a/distros/melodic/copernicus-navigation/default.nix +++ b/distros/melodic/copernicus-navigation/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The copernicus_navigation package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/copernicus-rules/default.nix b/distros/melodic/copernicus-rules/default.nix index f908a3e6e5..942714dfe8 100644 --- a/distros/melodic/copernicus-rules/default.nix +++ b/distros/melodic/copernicus-rules/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The copernicus_rules package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/copernicus-teleoperator/default.nix b/distros/melodic/copernicus-teleoperator/default.nix index 84bf5e90ff..d2add082aa 100644 --- a/distros/melodic/copernicus-teleoperator/default.nix +++ b/distros/melodic/copernicus-teleoperator/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The copernicus_teleoperator package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/cpu-temperature-diagnostics/default.nix b/distros/melodic/cpu-temperature-diagnostics/default.nix index 75c26fc2b7..3c91b6b73d 100644 --- a/distros/melodic/cpu-temperature-diagnostics/default.nix +++ b/distros/melodic/cpu-temperature-diagnostics/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Collect and diagnose cpu temperature informations''; - license = with lib.licenses; [ "(c) Ascent Robotics Inc. All rights reserved." ]; + license = with lib.licenses; [ "-c-Ascent-Robotics-Inc.-All-rights-reserved." ]; }; } diff --git a/distros/melodic/criutils/default.nix b/distros/melodic/criutils/default.nix index 042a9cf3d4..73e7c85b72 100644 --- a/distros/melodic/criutils/default.nix +++ b/distros/melodic/criutils/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The criutils package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/csm/default.nix b/distros/melodic/csm/default.nix index 2a5595cdc9..96a08130fc 100644 --- a/distros/melodic/csm/default.nix +++ b/distros/melodic/csm/default.nix @@ -26,6 +26,6 @@ buildRosPackage { It is robust enough to be used in industrial prototypes of autonomous mobile robotics, for example at Kuka. CSM is used by a variety of people, though it is hard to keep track because of the open source distribution, especially as packaged in ROS. If you use this software for something cool, let me know. ''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/cvp-mesh-planner/default.nix b/distros/melodic/cvp-mesh-planner/default.nix index 850af0c201..ebd8b99ca4 100644 --- a/distros/melodic/cvp-mesh-planner/default.nix +++ b/distros/melodic/cvp-mesh-planner/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The Continuous Vector Field Planner (CVP) mesh planner package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/dccomms-ros-msgs/default.nix b/distros/melodic/dccomms-ros-msgs/default.nix index 741de97c4d..b820fa0060 100644 --- a/distros/melodic/dccomms-ros-msgs/default.nix +++ b/distros/melodic/dccomms-ros-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The dccomms_ros_msgs package''; - license = with lib.licenses; [ "TODO" ]; + license = with lib.licenses; [ "TODO-CATKIN-PACKAGE-LICENSE" ]; }; } diff --git a/distros/melodic/dccomms-ros/default.nix b/distros/melodic/dccomms-ros/default.nix index af51004d2d..623c63b6f6 100644 --- a/distros/melodic/dccomms-ros/default.nix +++ b/distros/melodic/dccomms-ros/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The dccomms_ros package''; - license = with lib.licenses; [ "TODO" ]; + license = with lib.licenses; [ "TODO-CATKIN-PACKAGE-LICENSE" ]; }; } diff --git a/distros/melodic/dijkstra-mesh-planner/default.nix b/distros/melodic/dijkstra-mesh-planner/default.nix index e5e1a33ef7..912f2dbf8c 100644 --- a/distros/melodic/dijkstra-mesh-planner/default.nix +++ b/distros/melodic/dijkstra-mesh-planner/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The dijkstra_mesh_planner package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/downward/default.nix b/distros/melodic/downward/default.nix index 6c334b9966..8084014087 100644 --- a/distros/melodic/downward/default.nix +++ b/distros/melodic/downward/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''fast downward: PDDL Planner (http://www.fast-downward.org)''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/eiquadprog/default.nix b/distros/melodic/eiquadprog/default.nix index 3782325d39..d1b405d9be 100644 --- a/distros/melodic/eiquadprog/default.nix +++ b/distros/melodic/eiquadprog/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Eiquadprog a QP solver using active sets''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/eml/default.nix b/distros/melodic/eml/default.nix index a2493d2e24..6a418d5f2a 100644 --- a/distros/melodic/eml/default.nix +++ b/distros/melodic/eml/default.nix @@ -20,6 +20,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 = with lib.licenses; [ "Binary Only" ]; + license = with lib.licenses; [ "Binary-Only" ]; }; } diff --git a/distros/melodic/euslime/default.nix b/distros/melodic/euslime/default.nix index 70357152f2..1ed4caa4a5 100644 --- a/distros/melodic/euslime/default.nix +++ b/distros/melodic/euslime/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, catkin-virtualenv, roseus, slime-ros }: buildRosPackage { pname = "ros-melodic-euslime"; - version = "1.1.0-r1"; + version = "1.1.1-r1"; src = fetchurl { - url = "https://github.com/jsk-ros-pkg/euslime-release/archive/release/melodic/euslime/1.1.0-1.tar.gz"; - name = "1.1.0-1.tar.gz"; - sha256 = "39ee14b35eccdb4b3024938289d3c5c4b9b23a356314f584500324aaf2f0a0cd"; + url = "https://github.com/jsk-ros-pkg/euslime-release/archive/release/melodic/euslime/1.1.1-1.tar.gz"; + name = "1.1.1-1.tar.gz"; + sha256 = "7b1218610fe3dcd041423a9651ba5111032e787359bf3c845887f7de2968c3b3"; }; buildType = "catkin"; diff --git a/distros/melodic/fath-pivot-mount-description/default.nix b/distros/melodic/fath-pivot-mount-description/default.nix new file mode 100644 index 0000000000..1c10760b57 --- /dev/null +++ b/distros/melodic/fath-pivot-mount-description/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, urdf, xacro }: +buildRosPackage { + pname = "ros-melodic-fath-pivot-mount-description"; + version = "0.1.1-r1"; + + src = fetchurl { + url = "https://github.com/clearpath-gbp/fath_pivot_mount_description-release/archive/release/melodic/fath_pivot_mount_description/0.1.1-1.tar.gz"; + name = "0.1.1-1.tar.gz"; + sha256 = "1c7057694a115d2619cc762d0aeb4d0f421d0f7bfba2a7e155d31d31dee4174d"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ urdf xacro ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''URDF Macro for adding an adjustable, fath pivot mount used for cameras and other sensors''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/melodic/fetch-description/default.nix b/distros/melodic/fetch-description/default.nix index fc66c1dbf7..04f43ae6f6 100644 --- a/distros/melodic/fetch-description/default.nix +++ b/distros/melodic/fetch-description/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''URDF for Fetch Robot.''; - license = with lib.licenses; [ "CC-BY-SA-3.0" ]; + license = with lib.licenses; [ cc-by-nc-sa-40 ]; }; } diff --git a/distros/melodic/fetch-open-auto-dock/default.nix b/distros/melodic/fetch-open-auto-dock/default.nix index 4da696a32e..27c19cd868 100644 --- a/distros/melodic/fetch-open-auto-dock/default.nix +++ b/distros/melodic/fetch-open-auto-dock/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''An open-source version of the Fetch charge docking system.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/ff/default.nix b/distros/melodic/ff/default.nix index 68932a8398..0dce220527 100644 --- a/distros/melodic/ff/default.nix +++ b/distros/melodic/ff/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ff: pddl planner. see http://www.loria.fr/~hoffmanj/ff.html''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/ffha/default.nix b/distros/melodic/ffha/default.nix index d94399c472..e8985611e5 100644 --- a/distros/melodic/ffha/default.nix +++ b/distros/melodic/ffha/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ffha: PDDL Planner (http://ipc.informatik.uni-freiburg.de)''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/flir-ptu-driver/default.nix b/distros/melodic/flir-ptu-driver/default.nix index 9b54f4d247..c6ef5b3f28 100644 --- a/distros/melodic/flir-ptu-driver/default.nix +++ b/distros/melodic/flir-ptu-driver/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Driver for the FLIR pan/tilt units.''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/force-torque-sensor/default.nix b/distros/melodic/force-torque-sensor/default.nix index 180b41dd5e..3a2e7ed9f6 100644 --- a/distros/melodic/force-torque-sensor/default.nix +++ b/distros/melodic/force-torque-sensor/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The force_torque_sensor package''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/frame-editor/default.nix b/distros/melodic/frame-editor/default.nix new file mode 100644 index 0000000000..ffb029f014 --- /dev/null +++ b/distros/melodic/frame-editor/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, dynamic-reconfigure, geometry-msgs, interactive-markers, message-generation, message-runtime, qt-gui-py-common, rospy, rqt-gui, rqt-gui-py, std-msgs, tf, visualization-msgs }: +buildRosPackage { + pname = "ros-melodic-frame-editor"; + version = "1.1.0-r1"; + + src = fetchurl { + url = "https://github.com/ipa320/rqt_frame_editor_plugin-release/archive/release/melodic/frame_editor/1.1.0-1.tar.gz"; + name = "1.1.0-1.tar.gz"; + sha256 = "8d5c116e76290ef74906fc74f50588c54d9a850ed6af06d766fd37be7ecef4c8"; + }; + + buildType = "catkin"; + buildInputs = [ message-generation ]; + propagatedBuildInputs = [ dynamic-reconfigure geometry-msgs interactive-markers message-runtime qt-gui-py-common rospy rqt-gui rqt-gui-py std-msgs tf visualization-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''The frame_editor package''; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/distros/melodic/gazebo-plugins/default.nix b/distros/melodic/gazebo-plugins/default.nix index 4f3e3530ec..a17b744c4d 100644 --- a/distros/melodic/gazebo-plugins/default.nix +++ b/distros/melodic/gazebo-plugins/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components.''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-&-Apache-2.0" ]; }; } diff --git a/distros/melodic/gazebo-ros-pkgs/default.nix b/distros/melodic/gazebo-ros-pkgs/default.nix index cf134a2e86..94a524723a 100644 --- a/distros/melodic/gazebo-ros-pkgs/default.nix +++ b/distros/melodic/gazebo-ros-pkgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Interface for using ROS with the Gazebo simulator.''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-&-LGPL-&-Apache-2.0" ]; }; } diff --git a/distros/melodic/gazebo-video-monitor-msgs/default.nix b/distros/melodic/gazebo-video-monitor-msgs/default.nix index 38ebce18f5..a6fc62eced 100644 --- a/distros/melodic/gazebo-video-monitor-msgs/default.nix +++ b/distros/melodic/gazebo-video-monitor-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''gazebo_video_monitor_msgs defines interfaces for the gazebo_video_monitor_plugins package.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/gazebo-video-monitor-plugins/default.nix b/distros/melodic/gazebo-video-monitor-plugins/default.nix index 254e1f7192..4345924d70 100644 --- a/distros/melodic/gazebo-video-monitor-plugins/default.nix +++ b/distros/melodic/gazebo-video-monitor-plugins/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''gazebo_video_monitor_plugins is a package that lets the user record videos of a Gazebo simulation. It provides a multicamera sensor that can be used for creating different types of videos with multiple views from inside the gazebo world. There is a number of plugins already available in the package, but more can be developed by the user, with minimal effort, to fit arbitrary use cases.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/gazebo-video-monitors/default.nix b/distros/melodic/gazebo-video-monitors/default.nix index 2174a29262..993fe0338a 100644 --- a/distros/melodic/gazebo-video-monitors/default.nix +++ b/distros/melodic/gazebo-video-monitors/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Metapackage that groups together the gazebo_video_monitors packages.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/generated.nix b/distros/melodic/generated.nix index 4c232c9f3a..3310311844 100644 --- a/distros/melodic/generated.nix +++ b/distros/melodic/generated.nix @@ -1024,6 +1024,8 @@ self: super: { fake-localization = self.callPackage ./fake-localization {}; + fath-pivot-mount-description = self.callPackage ./fath-pivot-mount-description {}; + fcl-catkin = self.callPackage ./fcl-catkin {}; fetch-auto-dock-msgs = self.callPackage ./fetch-auto-dock-msgs {}; @@ -1132,6 +1134,8 @@ self: super: { four-wheel-steering-msgs = self.callPackage ./four-wheel-steering-msgs {}; + frame-editor = self.callPackage ./frame-editor {}; + franka-control = self.callPackage ./franka-control {}; franka-description = self.callPackage ./franka-description {}; @@ -4102,6 +4106,24 @@ self: super: { topic-tools = self.callPackage ./topic-tools {}; + toposens = self.callPackage ./toposens {}; + + toposens-bringup = self.callPackage ./toposens-bringup {}; + + toposens-description = self.callPackage ./toposens-description {}; + + toposens-driver = self.callPackage ./toposens-driver {}; + + toposens-echo-driver = self.callPackage ./toposens-echo-driver {}; + + toposens-markers = self.callPackage ./toposens-markers {}; + + toposens-msgs = self.callPackage ./toposens-msgs {}; + + toposens-pointcloud = self.callPackage ./toposens-pointcloud {}; + + toposens-sync = self.callPackage ./toposens-sync {}; + tork-moveit-tutorial = self.callPackage ./tork-moveit-tutorial {}; towr = self.callPackage ./towr {}; diff --git a/distros/melodic/graceful-controller-ros/default.nix b/distros/melodic/graceful-controller-ros/default.nix index 9f9f8fd610..9a0d1289a1 100644 --- a/distros/melodic/graceful-controller-ros/default.nix +++ b/distros/melodic/graceful-controller-ros/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, angles, base-local-planner, catkin, costmap-2d, dynamic-reconfigure, geometry-msgs, graceful-controller, nav-core, nav-msgs, pluginlib, roscpp, std-msgs, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-melodic-graceful-controller-ros"; - version = "0.4.0-r1"; + version = "0.4.1-r1"; src = fetchurl { - url = "https://github.com/mikeferguson/graceful_controller-gbp/archive/release/melodic/graceful_controller_ros/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "b4637050cf6bd9f01a16b064389b3a30d1a739b76d7c5f234f2add7009081b05"; + url = "https://github.com/mikeferguson/graceful_controller-gbp/archive/release/melodic/graceful_controller_ros/0.4.1-1.tar.gz"; + name = "0.4.1-1.tar.gz"; + sha256 = "77428b472e817bb6706378187bca04adee3d40c96b9e48288b5e4d18801f7098"; }; buildType = "catkin"; diff --git a/distros/melodic/graceful-controller/default.nix b/distros/melodic/graceful-controller/default.nix index 553bff7c4f..3a95fb5ee5 100644 --- a/distros/melodic/graceful-controller/default.nix +++ b/distros/melodic/graceful-controller/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, angles, catkin, roscpp }: buildRosPackage { pname = "ros-melodic-graceful-controller"; - version = "0.4.0-r1"; + version = "0.4.1-r1"; src = fetchurl { - url = "https://github.com/mikeferguson/graceful_controller-gbp/archive/release/melodic/graceful_controller/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "c682e31e87543d1624c5cee00831ec7d2fbe7339220135002422917afd9585b8"; + url = "https://github.com/mikeferguson/graceful_controller-gbp/archive/release/melodic/graceful_controller/0.4.1-1.tar.gz"; + name = "0.4.1-1.tar.gz"; + sha256 = "b2adf5d5064b6d86ff54e3e010fb5fd9b64a191f49adcb381035ccd91371f99b"; }; buildType = "catkin"; @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''A controller.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/gundam-rx78-description/default.nix b/distros/melodic/gundam-rx78-description/default.nix index 89fbdadd15..77bf03a41b 100644 --- a/distros/melodic/gundam-rx78-description/default.nix +++ b/distros/melodic/gundam-rx78-description/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''gundam_rx78_description contains the ROS URDF file of the GUNDAM RX-78 robot''; - license = with lib.licenses; [ "TERMS OF USE FOR GUNDAM RESEARCH OPEN SIMULATOR Attribution-NonCommercial-ShareAlike" bsdOriginal ]; + license = with lib.licenses; [ "TERMS-OF-USE-FOR-GUNDAM-RESEARCH-OPEN-SIMULATOR-Attribution-NonCommercial-ShareAlike" bsdOriginal ]; }; } diff --git a/distros/melodic/h264-encoder-core/default.nix b/distros/melodic/h264-encoder-core/default.nix index 22e1f28632..797929260a 100644 --- a/distros/melodic/h264-encoder-core/default.nix +++ b/distros/melodic/h264-encoder-core/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Common base code for ROS1/ROS2 H264 encoder node''; - license = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-only" ]; }; } diff --git a/distros/melodic/h264-video-encoder/default.nix b/distros/melodic/h264-video-encoder/default.nix index f411d145e9..46ea1499d0 100644 --- a/distros/melodic/h264-video-encoder/default.nix +++ b/distros/melodic/h264-video-encoder/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''ROS1 H264 encoder node''; - license = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-only" ]; }; } diff --git a/distros/melodic/handeye/default.nix b/distros/melodic/handeye/default.nix index 29e6c82272..a1bfbbef8a 100644 --- a/distros/melodic/handeye/default.nix +++ b/distros/melodic/handeye/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''The handeye package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/hdf5-map-io/default.nix b/distros/melodic/hdf5-map-io/default.nix index 8fd1bee562..6035388c44 100644 --- a/distros/melodic/hdf5-map-io/default.nix +++ b/distros/melodic/hdf5-map-io/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The hdf5_map_io package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/hebi-cpp-api/default.nix b/distros/melodic/hebi-cpp-api/default.nix index 00e8660af9..e7b1eb9a7b 100644 --- a/distros/melodic/hebi-cpp-api/default.nix +++ b/distros/melodic/hebi-cpp-api/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''A ROS package providing access to the HEBI C++ API.''; - license = with 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/distros/melodic/hironx-ros-bridge/default.nix b/distros/melodic/hironx-ros-bridge/default.nix index 0a8d7ba587..5b07e178c1 100644 --- a/distros/melodic/hironx-ros-bridge/default.nix +++ b/distros/melodic/hironx-ros-bridge/default.nix @@ -24,6 +24,6 @@ buildRosPackage { NOTE: This package is multi-license -- pay attention to file header in each file where license is declared. For Creative Commons nc 4.0 applied, see here.

This package also contains some sensor driver software (as of April 2016 they are the following force sensors such as Dynpick and JR3) for QNX. These drivers are stored in this robot-specific package for not many reasons than they are slightly customized for the robot. So if you can separate those as a standalone, generic package that'll be appreciated (please just let us know if you will).

''; - license = with lib.licenses; [ bsdOriginal "CC-BY-SA-3.0" ]; + license = with lib.licenses; [ bsdOriginal "CC-BY-NC-4.0" ]; }; } diff --git a/distros/melodic/hpp-fcl/default.nix b/distros/melodic/hpp-fcl/default.nix index c17906434a..6547157ca6 100644 --- a/distros/melodic/hpp-fcl/default.nix +++ b/distros/melodic/hpp-fcl/default.nix @@ -2,24 +2,24 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, assimp, boost, catkin, eigen, git, octomap }: +{ lib, buildRosPackage, fetchurl, assimp, boost, catkin, cmake, doxygen, eigen, eigenpy, git, octomap, python, pythonPackages }: buildRosPackage { pname = "ros-melodic-hpp-fcl"; - version = "1.0.1-r2"; + version = "1.8.1-r1"; src = fetchurl { - url = "https://github.com/humanoid-path-planner/hpp-fcl-ros-release/archive/release/melodic/hpp-fcl/1.0.1-2.tar.gz"; - name = "1.0.1-2.tar.gz"; - sha256 = "2fdf0400d19ccdc82b6788b4715d5adf11af7e3159f8cd87f5a401ddd3fb53f5"; + url = "https://github.com/humanoid-path-planner/hpp-fcl-ros-release/archive/release/melodic/hpp-fcl/1.8.1-1.tar.gz"; + name = "1.8.1-1.tar.gz"; + sha256 = "594d688b680ff946d06f8ddd0ccebd41ea887af0ad261efc5a097b10b4a97e8b"; }; - buildType = "catkin"; - buildInputs = [ git ]; - propagatedBuildInputs = [ assimp boost eigen octomap ]; - nativeBuildInputs = [ catkin ]; + buildType = "cmake"; + buildInputs = [ doxygen git pythonPackages.lxml ]; + propagatedBuildInputs = [ assimp boost catkin eigen eigenpy octomap python pythonPackages.numpy ]; + nativeBuildInputs = [ cmake ]; meta = { - description = ''HPP fork of FCL with bug fixes.''; + description = ''An extension of the Flexible Collision Library.''; license = with lib.licenses; [ bsdOriginal ]; }; } diff --git a/distros/melodic/ifm3d-core/default.nix b/distros/melodic/ifm3d-core/default.nix index 58e1a17c66..9d8641920c 100644 --- a/distros/melodic/ifm3d-core/default.nix +++ b/distros/melodic/ifm3d-core/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Library and Utilities for working with ifm pmd-based 3D ToF Cameras''; - license = with lib.licenses; [ "Apache-1.0" ]; + license = with lib.licenses; [ "Apache" ]; }; } diff --git a/distros/melodic/igvc-self-drive-description/default.nix b/distros/melodic/igvc-self-drive-description/default.nix index a3dac99dd4..0a3a67cf7c 100644 --- a/distros/melodic/igvc-self-drive-description/default.nix +++ b/distros/melodic/igvc-self-drive-description/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Meshes and URDF descriptions for Gem vehicle''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-2-Clause" ]; }; } diff --git a/distros/melodic/igvc-self-drive-gazebo-plugins/default.nix b/distros/melodic/igvc-self-drive-gazebo-plugins/default.nix index 5201f3fd3e..8c4295bc5b 100644 --- a/distros/melodic/igvc-self-drive-gazebo-plugins/default.nix +++ b/distros/melodic/igvc-self-drive-gazebo-plugins/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Gazebo plugins for IGVC Self-Drive simulator''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-2-Clause" ]; }; } diff --git a/distros/melodic/igvc-self-drive-gazebo/default.nix b/distros/melodic/igvc-self-drive-gazebo/default.nix index 19c83aa07b..5e8a3168ae 100644 --- a/distros/melodic/igvc-self-drive-gazebo/default.nix +++ b/distros/melodic/igvc-self-drive-gazebo/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Gazebo models and runtime configuration for igvc_self_drive simulator''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-2-Clause" ]; }; } diff --git a/distros/melodic/iirob-filters/default.nix b/distros/melodic/iirob-filters/default.nix index d917816b2b..15f4c46b57 100644 --- a/distros/melodic/iirob-filters/default.nix +++ b/distros/melodic/iirob-filters/default.nix @@ -24,6 +24,6 @@ buildRosPackage { 3) Gravity Compensation (used for force-torque sensors) 4) Threshold Filter 5) Kalman Filter''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/imagesift/default.nix b/distros/melodic/imagesift/default.nix index 0c8f9c918f..0cd14a388b 100644 --- a/distros/melodic/imagesift/default.nix +++ b/distros/melodic/imagesift/default.nix @@ -23,6 +23,6 @@ buildRosPackage { 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 = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/imu-filter-madgwick/default.nix b/distros/melodic/imu-filter-madgwick/default.nix index 400e2a4503..5804674831 100644 --- a/distros/melodic/imu-filter-madgwick/default.nix +++ b/distros/melodic/imu-filter-madgwick/default.nix @@ -20,6 +20,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 = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/imu-pipeline/default.nix b/distros/melodic/imu-pipeline/default.nix index e2025e0007..bf434a76f8 100644 --- a/distros/melodic/imu-pipeline/default.nix +++ b/distros/melodic/imu-pipeline/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''imu_pipeline''; - license = with lib.licenses; [ bsdOriginal gpl1 ]; + license = with lib.licenses; [ bsdOriginal "GPL" ]; }; } diff --git a/distros/melodic/imu-tools/default.nix b/distros/melodic/imu-tools/default.nix index 1d10beaa3a..e2bf489393 100644 --- a/distros/melodic/imu-tools/default.nix +++ b/distros/melodic/imu-tools/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Various tools for IMU devices''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-GPL" ]; }; } diff --git a/distros/melodic/imu-transformer/default.nix b/distros/melodic/imu-transformer/default.nix index 7365d71301..d3580cc10b 100644 --- a/distros/melodic/imu-transformer/default.nix +++ b/distros/melodic/imu-transformer/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another.''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/ipr-extern/default.nix b/distros/melodic/ipr-extern/default.nix index 3d587f97b0..e50b0f8961 100644 --- a/distros/melodic/ipr-extern/default.nix +++ b/distros/melodic/ipr-extern/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Package with external libraries used in Industrial and Service workspaces. Currentlly supported Libraries: Reflexxes, Libmodbus.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/ivcon/default.nix b/distros/melodic/ivcon/default.nix index d01ed81b8a..6bd8a268c9 100644 --- a/distros/melodic/ivcon/default.nix +++ b/distros/melodic/ivcon/default.nix @@ -24,6 +24,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 = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/jackal-control/default.nix b/distros/melodic/jackal-control/default.nix index 06b1ce675b..eda830d22d 100644 --- a/distros/melodic/jackal-control/default.nix +++ b/distros/melodic/jackal-control/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, controller-manager, diff-drive-controller, interactive-marker-twist-server, joint-state-controller, joy, robot-localization, roslaunch, teleop-twist-joy, topic-tools, twist-mux }: buildRosPackage { pname = "ros-melodic-jackal-control"; - version = "0.7.8-r1"; + version = "0.7.9-r1"; src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/melodic/jackal_control/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "1b9b235a034db914f87e24fbc7c2f1380e0d582992d5e37a8e4d573c8eaea198"; + url = "https://github.com/clearpath-gbp/jackal-release/archive/release/melodic/jackal_control/0.7.9-1.tar.gz"; + name = "0.7.9-1.tar.gz"; + sha256 = "9da372686eb7b4f1d358c49742d05a7fc61bb8a268f471b2c4afd93787f824c0"; }; buildType = "catkin"; diff --git a/distros/melodic/jackal-description/default.nix b/distros/melodic/jackal-description/default.nix index 1e8b9409e9..2814f594ca 100644 --- a/distros/melodic/jackal-description/default.nix +++ b/distros/melodic/jackal-description/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, lms1xx, pointgrey-camera-description, robot-state-publisher, roslaunch, urdf, velodyne-description, xacro }: buildRosPackage { pname = "ros-melodic-jackal-description"; - version = "0.7.8-r1"; + version = "0.7.9-r1"; src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/melodic/jackal_description/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "7cc7ce82831529fe3dbfc36161b47490f2bcd26105851daec8764ea024850c99"; + url = "https://github.com/clearpath-gbp/jackal-release/archive/release/melodic/jackal_description/0.7.9-1.tar.gz"; + name = "0.7.9-1.tar.gz"; + sha256 = "0e38b7d6c63c6c725dae1e14f3bbcb90742ccc51adc03a0225cc0af7ded75f77"; }; buildType = "catkin"; diff --git a/distros/melodic/jackal-msgs/default.nix b/distros/melodic/jackal-msgs/default.nix index 31ea243ebf..bcac2b1ad8 100644 --- a/distros/melodic/jackal-msgs/default.nix +++ b/distros/melodic/jackal-msgs/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-melodic-jackal-msgs"; - version = "0.7.8-r1"; + version = "0.7.9-r1"; src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/melodic/jackal_msgs/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "de0f164f4a5563fa2b8a113e456d1933d5080c67c4b4825193d7e749f3a3e217"; + url = "https://github.com/clearpath-gbp/jackal-release/archive/release/melodic/jackal_msgs/0.7.9-1.tar.gz"; + name = "0.7.9-1.tar.gz"; + sha256 = "31665bffdaaeff1bbc8a310b8171bc06cd5c3a847bd21a3118b61ebfc9903171"; }; buildType = "catkin"; diff --git a/distros/melodic/jackal-navigation/default.nix b/distros/melodic/jackal-navigation/default.nix index 333fda4af5..4ba3de0e66 100644 --- a/distros/melodic/jackal-navigation/default.nix +++ b/distros/melodic/jackal-navigation/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, amcl, catkin, gmapping, map-server, move-base, roslaunch, urdf, xacro }: buildRosPackage { pname = "ros-melodic-jackal-navigation"; - version = "0.7.8-r1"; + version = "0.7.9-r1"; src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/melodic/jackal_navigation/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "d722054cec54ab540df895646e88c4157f1040647d8934f3ab2dd10db888b884"; + url = "https://github.com/clearpath-gbp/jackal-release/archive/release/melodic/jackal_navigation/0.7.9-1.tar.gz"; + name = "0.7.9-1.tar.gz"; + sha256 = "e709c33ef9e6ab625c9794e9a85321ded1ec0a6c5bc1a01effe53fdefc6e5c55"; }; buildType = "catkin"; diff --git a/distros/melodic/jackal-tutorials/default.nix b/distros/melodic/jackal-tutorials/default.nix index cbfddd66d4..6953ec8e88 100644 --- a/distros/melodic/jackal-tutorials/default.nix +++ b/distros/melodic/jackal-tutorials/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, rosdoc-lite }: buildRosPackage { pname = "ros-melodic-jackal-tutorials"; - version = "0.7.8-r1"; + version = "0.7.9-r1"; src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/melodic/jackal_tutorials/0.7.8-1.tar.gz"; - name = "0.7.8-1.tar.gz"; - sha256 = "c406b696e44dd2f1a39fea9ae9b800db0b4b24b8174bfe5e3253cc2685fe6710"; + url = "https://github.com/clearpath-gbp/jackal-release/archive/release/melodic/jackal_tutorials/0.7.9-1.tar.gz"; + name = "0.7.9-1.tar.gz"; + sha256 = "e8c1bfc21e3856b26debe505dba8d6da6f148a233145a1fb0fbc2093eadc1d28"; }; buildType = "catkin"; diff --git a/distros/melodic/jderobot-color-tuner/default.nix b/distros/melodic/jderobot-color-tuner/default.nix index 209d5a11d9..5a302c592d 100644 --- a/distros/melodic/jderobot-color-tuner/default.nix +++ b/distros/melodic/jderobot-color-tuner/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The jderobot_color_tuner tool package''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/jointstick/default.nix b/distros/melodic/jointstick/default.nix index ea24557cb1..f1ba5b8dd2 100644 --- a/distros/melodic/jointstick/default.nix +++ b/distros/melodic/jointstick/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Move any joint with any controller!''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/julius/default.nix b/distros/melodic/julius/default.nix index 10ab0f5343..a060a261a7 100644 --- a/distros/melodic/julius/default.nix +++ b/distros/melodic/julius/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''julius: Open-Source Large Vocabulary CSR Engine (http://julius.sourceforge.jp/index.php)''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/khi-duaro-description/default.nix b/distros/melodic/khi-duaro-description/default.nix index 24920bb677..af8c39ef97 100644 --- a/distros/melodic/khi-duaro-description/default.nix +++ b/distros/melodic/khi-duaro-description/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The khi_duaro_description package''; - license = with lib.licenses; [ bsdOriginal "KHI CAD license (mesh data, see readme)" ]; + license = with lib.licenses; [ bsdOriginal "KHI-CAD-license-mesh-data,-see-readme-" ]; }; } diff --git a/distros/melodic/khi-rs-description/default.nix b/distros/melodic/khi-rs-description/default.nix index 27ea4be66b..ee64287b19 100644 --- a/distros/melodic/khi-rs-description/default.nix +++ b/distros/melodic/khi-rs-description/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The khi_rs_description package''; - license = with lib.licenses; [ bsdOriginal "KHI CAD license (mesh data, see readme)" ]; + license = with lib.licenses; [ bsdOriginal "KHI-CAD-license-mesh-data,-see-readme-" ]; }; } diff --git a/distros/melodic/label-manager/default.nix b/distros/melodic/label-manager/default.nix index 9257aca783..db0efc161b 100644 --- a/distros/melodic/label-manager/default.nix +++ b/distros/melodic/label-manager/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Serving and persisting label information''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/laser-scan-matcher/default.nix b/distros/melodic/laser-scan-matcher/default.nix index 66925167fb..06589cf7c4 100644 --- a/distros/melodic/laser-scan-matcher/default.nix +++ b/distros/melodic/laser-scan-matcher/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''

An incremental laser scan matcher, using Andrea Censi's Canonical Scan Matcher (CSM) implementation. See the web site for more about CSM. NOTE the CSM library is licensed under the GNU Lesser General Public License v3, whereas the rest of the code is released under the BSD license.

''; - license = with lib.licenses; [ bsdOriginal lgpl2 ]; + license = with lib.licenses; [ bsdOriginal "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/libdlib/default.nix b/distros/melodic/libdlib/default.nix index 5b6f8bee05..3496ced429 100644 --- a/distros/melodic/libdlib/default.nix +++ b/distros/melodic/libdlib/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package wraps the external c++ library dlib (http://dlib.net/) in a ROS package, so other packages can use it. The code was obtained from https://github.com/davisking/dlib . For further descriptions and tutorials see the Makefile.tarball and http://dlib.net/ .''; - license = with lib.licenses; [ boost ]; + license = with lib.licenses; [ "BSL-1.0" ]; }; } diff --git a/distros/melodic/libfranka/default.nix b/distros/melodic/libfranka/default.nix index d00e2473ec..88ecebcc7f 100644 --- a/distros/melodic/libfranka/default.nix +++ b/distros/melodic/libfranka/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cmake, eigen, poco }: buildRosPackage { pname = "ros-melodic-libfranka"; - version = "0.8.0-r1"; + version = "0.9.0-r1"; src = fetchurl { - url = "https://github.com/frankaemika/libfranka-release/archive/release/melodic/libfranka/0.8.0-1.tar.gz"; - name = "0.8.0-1.tar.gz"; - sha256 = "cd81ede59824257d1e44276b53d2c7282e5b60b904f8fe3fe7b4548dfff01c4e"; + url = "https://github.com/frankaemika/libfranka-release/archive/release/melodic/libfranka/0.9.0-1.tar.gz"; + name = "0.9.0-1.tar.gz"; + sha256 = "777d6d9868cacdedcf85f08d5a89c5e8a88b6fd13c86c82774104b9a91e44ad2"; }; buildType = "cmake"; diff --git a/distros/melodic/libmavconn/default.nix b/distros/melodic/libmavconn/default.nix index 758525966f..41916ed414 100644 --- a/distros/melodic/libmavconn/default.nix +++ b/distros/melodic/libmavconn/default.nix @@ -24,6 +24,6 @@ buildRosPackage { and URL to connection object mapper. This library can be used in standalone programs.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/melodic/libmodbus/default.nix b/distros/melodic/libmodbus/default.nix index 566059d43e..234549f76e 100644 --- a/distros/melodic/libmodbus/default.nix +++ b/distros/melodic/libmodbus/default.nix @@ -23,6 +23,6 @@ buildRosPackage { 2) Moving Mean 3) Gravity Compensation (used for force-torque sensors) 4) Threshold Filter''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/libntcan/default.nix b/distros/melodic/libntcan/default.nix index 7a8c409895..15c06a85c9 100644 --- a/distros/melodic/libntcan/default.nix +++ b/distros/melodic/libntcan/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package wraps the libntcan to use it as a ros dependency.''; - license = with lib.licenses; [ "proprietary" ]; + license = with lib.licenses; [ "Proprietary" ]; }; } diff --git a/distros/melodic/libpcan/default.nix b/distros/melodic/libpcan/default.nix index a3833b7286..67bf46a9df 100644 --- a/distros/melodic/libpcan/default.nix +++ b/distros/melodic/libpcan/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package wraps the libpcan to use it as a ros dependency''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/libphidget21/default.nix b/distros/melodic/libphidget21/default.nix index 191a4f89b5..04d367012e 100644 --- a/distros/melodic/libphidget21/default.nix +++ b/distros/melodic/libphidget21/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package wraps the libphidget21 to use it as a ROS dependency''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/libphidgets/default.nix b/distros/melodic/libphidgets/default.nix index 3e29dfb905..c3cdbb8378 100644 --- a/distros/melodic/libphidgets/default.nix +++ b/distros/melodic/libphidgets/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package wraps the libphidgets to use it as a ros dependency''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/libqt-concurrent/default.nix b/distros/melodic/libqt-concurrent/default.nix index ac6182da34..faeafee255 100644 --- a/distros/melodic/libqt-concurrent/default.nix +++ b/distros/melodic/libqt-concurrent/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''libqt-concurrent metapackage supporting qt4 and qt5''; - license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; + license = with lib.licenses; [ "United-States-Government-Purpose" "SwRI-Proprietary" ]; }; } diff --git a/distros/melodic/libqt-core/default.nix b/distros/melodic/libqt-core/default.nix index 6f2be5f29b..a85168bfb6 100644 --- a/distros/melodic/libqt-core/default.nix +++ b/distros/melodic/libqt-core/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''libqt-core metapackage supporting qt4 and qt5''; - license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; + license = with lib.licenses; [ "United-States-Government-Purpose" "SwRI-Proprietary" ]; }; } diff --git a/distros/melodic/libqt-dev/default.nix b/distros/melodic/libqt-dev/default.nix index c17e97aec3..410cd6c374 100644 --- a/distros/melodic/libqt-dev/default.nix +++ b/distros/melodic/libqt-dev/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''libqt-dev metapackage supporting qt4 and qt5''; - license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; + license = with lib.licenses; [ "United-States-Government-Purpose" "SwRI-Proprietary" ]; }; } diff --git a/distros/melodic/libqt-gui/default.nix b/distros/melodic/libqt-gui/default.nix index f91879add7..4c9ff23b48 100644 --- a/distros/melodic/libqt-gui/default.nix +++ b/distros/melodic/libqt-gui/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''libqt-gui metapackage supporting qt4 and qt5''; - license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; + license = with lib.licenses; [ "United-States-Government-Purpose" "SwRI-Proprietary" ]; }; } diff --git a/distros/melodic/libqt-network/default.nix b/distros/melodic/libqt-network/default.nix index 8aa1ec5beb..78c6e990aa 100644 --- a/distros/melodic/libqt-network/default.nix +++ b/distros/melodic/libqt-network/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''libqt-network metapackage supporting qt4 and qt5''; - license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; + license = with lib.licenses; [ "United-States-Government-Purpose" "SwRI-Proprietary" ]; }; } diff --git a/distros/melodic/libqt-opengl-dev/default.nix b/distros/melodic/libqt-opengl-dev/default.nix index 77eb7f9c2e..4cc0e9c50c 100644 --- a/distros/melodic/libqt-opengl-dev/default.nix +++ b/distros/melodic/libqt-opengl-dev/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''libqt-opengl metapackage supporting qt4 and qt5''; - license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; + license = with lib.licenses; [ "United-States-Government-Purpose" "SwRI-Proprietary" ]; }; } diff --git a/distros/melodic/libqt-opengl/default.nix b/distros/melodic/libqt-opengl/default.nix index 984ca864d4..f8a8b97838 100644 --- a/distros/melodic/libqt-opengl/default.nix +++ b/distros/melodic/libqt-opengl/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''libqt-opengl metapackage supporting qt4 and qt5''; - license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; + license = with lib.licenses; [ "United-States-Government-Purpose" "SwRI-Proprietary" ]; }; } diff --git a/distros/melodic/libqt-svg-dev/default.nix b/distros/melodic/libqt-svg-dev/default.nix index 35de1807db..3ac0689240 100644 --- a/distros/melodic/libqt-svg-dev/default.nix +++ b/distros/melodic/libqt-svg-dev/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''libqt-svg-dev metapackage supporting qt4 and qt5''; - license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; + license = with lib.licenses; [ "United-States-Government-Purpose" "SwRI-Proprietary" ]; }; } diff --git a/distros/melodic/libqt-widgets/default.nix b/distros/melodic/libqt-widgets/default.nix index d96acbed72..bdda9af4a2 100644 --- a/distros/melodic/libqt-widgets/default.nix +++ b/distros/melodic/libqt-widgets/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''libqt-widgets metapackage supporting qt4 and qt5''; - license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; + license = with lib.licenses; [ "United-States-Government-Purpose" "SwRI-Proprietary" ]; }; } diff --git a/distros/melodic/libreflexxestype2/default.nix b/distros/melodic/libreflexxestype2/default.nix index e0f22493a9..5b8e0f89e1 100644 --- a/distros/melodic/libreflexxestype2/default.nix +++ b/distros/melodic/libreflexxestype2/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''Package with ReflexxesTypeII implementation and header files''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/libsiftfast/default.nix b/distros/melodic/libsiftfast/default.nix index 53edecb62f..e41bfd97b7 100644 --- a/distros/melodic/libsiftfast/default.nix +++ b/distros/melodic/libsiftfast/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Library to compute SIFT features''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/linux-networking/default.nix b/distros/melodic/linux-networking/default.nix index d656aa48e3..1358b4b4ad 100644 --- a/distros/melodic/linux-networking/default.nix +++ b/distros/melodic/linux-networking/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The linux_networking package''; - license = with lib.licenses; [ "TODO" ]; + license = with lib.licenses; [ "TODO-CATKIN-PACKAGE-LICENSE" ]; }; } diff --git a/distros/melodic/lms1xx/default.nix b/distros/melodic/lms1xx/default.nix index 6a844ceabe..085a002c20 100644 --- a/distros/melodic/lms1xx/default.nix +++ b/distros/melodic/lms1xx/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The lms1xx package contains a basic ROS driver for the SICK LMS1xx line of LIDARs.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/lpg-planner/default.nix b/distros/melodic/lpg-planner/default.nix index 48914d28f5..ab16f19c7c 100644 --- a/distros/melodic/lpg-planner/default.nix +++ b/distros/melodic/lpg-planner/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''lpg_planner: LPGL Planner (http://zeus.ing.unibs.it/lpg/)''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/mav-comm/default.nix b/distros/melodic/mav-comm/default.nix index 31dc964b4c..e1616ddd64 100644 --- a/distros/melodic/mav-comm/default.nix +++ b/distros/melodic/mav-comm/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Contains messages and services for MAV communication''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/mav-msgs/default.nix b/distros/melodic/mav-msgs/default.nix index 12269314f3..09173ba86c 100644 --- a/distros/melodic/mav-msgs/default.nix +++ b/distros/melodic/mav-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Package containing messages for communicating with rotary wing MAVs''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/mav-planning-msgs/default.nix b/distros/melodic/mav-planning-msgs/default.nix index e1e94ed806..f19beb9fa8 100644 --- a/distros/melodic/mav-planning-msgs/default.nix +++ b/distros/melodic/mav-planning-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Messages specific to MAV planning, especially polynomial planning.''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/mavlink/default.nix b/distros/melodic/mavlink/default.nix index 20286cf5b6..83db6c1a1a 100644 --- a/distros/melodic/mavlink/default.nix +++ b/distros/melodic/mavlink/default.nix @@ -24,6 +24,6 @@ buildRosPackage { for both 1.0 and 2.0 versions of protocol. For pymavlink use separate install via rosdep (python-pymavlink).''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/mavros-extras/default.nix b/distros/melodic/mavros-extras/default.nix index 85b77b27df..378bfeb923 100644 --- a/distros/melodic/mavros-extras/default.nix +++ b/distros/melodic/mavros-extras/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Extra nodes and plugins for MAVROS.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/melodic/mavros-msgs/default.nix b/distros/melodic/mavros-msgs/default.nix index 71416f9c78..313e54a5ef 100644 --- a/distros/melodic/mavros-msgs/default.nix +++ b/distros/melodic/mavros-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''mavros_msgs defines messages for MAVROS.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/melodic/mavros/default.nix b/distros/melodic/mavros/default.nix index 04f8ea55b6..b0f014c5b8 100644 --- a/distros/melodic/mavros/default.nix +++ b/distros/melodic/mavros/default.nix @@ -22,6 +22,6 @@ buildRosPackage { meta = { description = ''MAVROS -- MAVLink extendable communication node for ROS with proxy for Ground Control Station.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/melodic/mbf-abstract-core/default.nix b/distros/melodic/mbf-abstract-core/default.nix index fd3ae819e4..9af5d7f70b 100644 --- a/distros/melodic/mbf-abstract-core/default.nix +++ b/distros/melodic/mbf-abstract-core/default.nix @@ -19,6 +19,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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mbf-abstract-nav/default.nix b/distros/melodic/mbf-abstract-nav/default.nix index d8cba0814a..df1f969c1f 100644 --- a/distros/melodic/mbf-abstract-nav/default.nix +++ b/distros/melodic/mbf-abstract-nav/default.nix @@ -19,6 +19,6 @@ buildRosPackage { 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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mbf-costmap-core/default.nix b/distros/melodic/mbf-costmap-core/default.nix index 21c43072bf..763d93122b 100644 --- a/distros/melodic/mbf-costmap-core/default.nix +++ b/distros/melodic/mbf-costmap-core/default.nix @@ -19,6 +19,6 @@ buildRosPackage { 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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mbf-costmap-nav/default.nix b/distros/melodic/mbf-costmap-nav/default.nix index 3574572e18..23ff56df10 100644 --- a/distros/melodic/mbf-costmap-nav/default.nix +++ b/distros/melodic/mbf-costmap-nav/default.nix @@ -21,6 +21,6 @@ buildRosPackage { 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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mbf-mesh-core/default.nix b/distros/melodic/mbf-mesh-core/default.nix index 7cf823b5b3..3b887b3826 100644 --- a/distros/melodic/mbf-mesh-core/default.nix +++ b/distros/melodic/mbf-mesh-core/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mbf_mesh_core package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mbf-mesh-nav/default.nix b/distros/melodic/mbf-mesh-nav/default.nix index aa1cbe420b..22990028bb 100644 --- a/distros/melodic/mbf-mesh-nav/default.nix +++ b/distros/melodic/mbf-mesh-nav/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mbf_mesh_nav package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mbf-msgs/default.nix b/distros/melodic/mbf-msgs/default.nix index 8f3a22e093..cee611c317 100644 --- a/distros/melodic/mbf-msgs/default.nix +++ b/distros/melodic/mbf-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { 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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mbf-recovery-behaviors/default.nix b/distros/melodic/mbf-recovery-behaviors/default.nix index 7e6180e8f3..22e2c50f4a 100644 --- a/distros/melodic/mbf-recovery-behaviors/default.nix +++ b/distros/melodic/mbf-recovery-behaviors/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mbf_recovery_behaviors package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mbf-simple-nav/default.nix b/distros/melodic/mbf-simple-nav/default.nix index d556166257..496ef534c0 100644 --- a/distros/melodic/mbf-simple-nav/default.nix +++ b/distros/melodic/mbf-simple-nav/default.nix @@ -21,6 +21,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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mbf-utility/default.nix b/distros/melodic/mbf-utility/default.nix index d6b330c343..73e374a943 100644 --- a/distros/melodic/mbf-utility/default.nix +++ b/distros/melodic/mbf-utility/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mbf_utility package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mesh-client/default.nix b/distros/melodic/mesh-client/default.nix index 8f046332e7..6537b32c77 100644 --- a/distros/melodic/mesh-client/default.nix +++ b/distros/melodic/mesh-client/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The mesh_client package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mesh-controller/default.nix b/distros/melodic/mesh-controller/default.nix index 477c6b9be1..24bb8a895b 100644 --- a/distros/melodic/mesh-controller/default.nix +++ b/distros/melodic/mesh-controller/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mesh_controller package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mesh-layers/default.nix b/distros/melodic/mesh-layers/default.nix index 74e013ab1b..b7a3ccb1fc 100644 --- a/distros/melodic/mesh-layers/default.nix +++ b/distros/melodic/mesh-layers/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mesh_layers package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mesh-map/default.nix b/distros/melodic/mesh-map/default.nix index 348835aeb6..36f1181f0e 100644 --- a/distros/melodic/mesh-map/default.nix +++ b/distros/melodic/mesh-map/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mesh_map package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mesh-msgs-conversions/default.nix b/distros/melodic/mesh-msgs-conversions/default.nix index cb9546707b..60d9b9a46c 100644 --- a/distros/melodic/mesh-msgs-conversions/default.nix +++ b/distros/melodic/mesh-msgs-conversions/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''converts point clouds and attributes into meshes and mesh attributes''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mesh-msgs-hdf5/default.nix b/distros/melodic/mesh-msgs-hdf5/default.nix index 8953f2f513..fd649090f8 100644 --- a/distros/melodic/mesh-msgs-hdf5/default.nix +++ b/distros/melodic/mesh-msgs-hdf5/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Read mesh_msgs from hdf5''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mesh-msgs-transform/default.nix b/distros/melodic/mesh-msgs-transform/default.nix index 75c25e20c6..f218a5ddf6 100644 --- a/distros/melodic/mesh-msgs-transform/default.nix +++ b/distros/melodic/mesh-msgs-transform/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Methods to transform mesh_msgs''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mesh-msgs/default.nix b/distros/melodic/mesh-msgs/default.nix index 3c032ec165..b3412e4a7b 100644 --- a/distros/melodic/mesh-msgs/default.nix +++ b/distros/melodic/mesh-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Various Message Types for Mesh Data.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mesh-navigation/default.nix b/distros/melodic/mesh-navigation/default.nix index 705ff08cee..0fa0876696 100644 --- a/distros/melodic/mesh-navigation/default.nix +++ b/distros/melodic/mesh-navigation/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mesh_navigation package provides a layered mesh_map implementation, a Move Base Flex mesh navigation server, as well as mesh navigation plugins for path planning and navigation control.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/microstrain-3dmgx2-imu/default.nix b/distros/melodic/microstrain-3dmgx2-imu/default.nix index 010be20e56..7d4faaad11 100644 --- a/distros/melodic/microstrain-3dmgx2-imu/default.nix +++ b/distros/melodic/microstrain-3dmgx2-imu/default.nix @@ -22,6 +22,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 = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/microstrain-mips/default.nix b/distros/melodic/microstrain-mips/default.nix index b14446d849..add02e0e8b 100644 --- a/distros/melodic/microstrain-mips/default.nix +++ b/distros/melodic/microstrain-mips/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The microstrain_mips package provides a driver for the LORD/Microstrain 3DM_GX5_XX GPS-aided IMU sensor.''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/mongodb-log/default.nix b/distros/melodic/mongodb-log/default.nix index b36048954a..e451349264 100644 --- a/distros/melodic/mongodb-log/default.nix +++ b/distros/melodic/mongodb-log/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The mongodb_log package''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/melodic/move-base-flex/default.nix b/distros/melodic/move-base-flex/default.nix index 80ec6f031d..f2931ac83e 100644 --- a/distros/melodic/move-base-flex/default.nix +++ b/distros/melodic/move-base-flex/default.nix @@ -21,6 +21,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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/move-base-sequence/default.nix b/distros/melodic/move-base-sequence/default.nix index dcdd81428d..6356c7db06 100644 --- a/distros/melodic/move-base-sequence/default.nix +++ b/distros/melodic/move-base-sequence/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The move_base_sequence package''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/moveback-recovery/default.nix b/distros/melodic/moveback-recovery/default.nix index aa69e5e295..04d5b339f8 100644 --- a/distros/melodic/moveback-recovery/default.nix +++ b/distros/melodic/moveback-recovery/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''The Move Base Flex (MBF) recovery behavior moves the robot back for specified length. It also checks the costmap for a possible collision behind the robot while moving and stops the robot if necessary.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/moveit-servo/default.nix b/distros/melodic/moveit-servo/default.nix index 16b12506b0..ab41dd0363 100644 --- a/distros/melodic/moveit-servo/default.nix +++ b/distros/melodic/moveit-servo/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Provides real-time manipulator Cartesian and joint servoing.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/mpc-local-planner-msgs/default.nix b/distros/melodic/mpc-local-planner-msgs/default.nix index 02171f0a33..0e328a751d 100644 --- a/distros/melodic/mpc-local-planner-msgs/default.nix +++ b/distros/melodic/mpc-local-planner-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package provides message types that are used by the package mpc_local_planner''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/mpc-local-planner/default.nix b/distros/melodic/mpc-local-planner/default.nix index 34a77b915c..ced38a4e3e 100644 --- a/distros/melodic/mpc-local-planner/default.nix +++ b/distros/melodic/mpc-local-planner/default.nix @@ -23,6 +23,6 @@ buildRosPackage { to the base_local_planner of the 2D navigation stack. It provides a generic and versatile model predictive control implementation with minimum-time and quadratic-form receding-horizon configurations.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/multi-interface-roam/default.nix b/distros/melodic/multi-interface-roam/default.nix index eb9ef8cd4c..bc59cb2fd6 100644 --- a/distros/melodic/multi-interface-roam/default.nix +++ b/distros/melodic/multi-interface-roam/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''sdsdddsdsds''; - license = with lib.licenses; [ bsdOriginal lgpl2 gpl1 ]; + license = with lib.licenses; [ bsdOriginal "LGPL" "GPL-for-sigblock" ]; }; } diff --git a/distros/melodic/nav2d-exploration/default.nix b/distros/melodic/nav2d-exploration/default.nix index 13527f6250..1f0d33113e 100644 --- a/distros/melodic/nav2d-exploration/default.nix +++ b/distros/melodic/nav2d-exploration/default.nix @@ -20,6 +20,6 @@ buildRosPackage { 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 = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/nav2d-karto/default.nix b/distros/melodic/nav2d-karto/default.nix index 54cdb8b813..c1be49f830 100644 --- a/distros/melodic/nav2d-karto/default.nix +++ b/distros/melodic/nav2d-karto/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Graph-based Simultaneous Localization and Mapping module. Includes OpenKarto GraphSLAM library by "SRI International".''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/nav2d-localizer/default.nix b/distros/melodic/nav2d-localizer/default.nix index 33f0cbbd93..577d4bfd1c 100644 --- a/distros/melodic/nav2d-localizer/default.nix +++ b/distros/melodic/nav2d-localizer/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Wrapper around Particle Filter implementation. The SelfLocalizer can be used as library or as a ros-node.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/nav2d-msgs/default.nix b/distros/melodic/nav2d-msgs/default.nix index 82312b13e1..5f78c63780 100644 --- a/distros/melodic/nav2d-msgs/default.nix +++ b/distros/melodic/nav2d-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Messages used for 2D-Navigation.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/nav2d-navigator/default.nix b/distros/melodic/nav2d-navigator/default.nix index 100af089ea..841f40d6c8 100644 --- a/distros/melodic/nav2d-navigator/default.nix +++ b/distros/melodic/nav2d-navigator/default.nix @@ -24,6 +24,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 = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/nav2d-operator/default.nix b/distros/melodic/nav2d-operator/default.nix index d84ab72e5c..8606c8d148 100644 --- a/distros/melodic/nav2d-operator/default.nix +++ b/distros/melodic/nav2d-operator/default.nix @@ -24,6 +24,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 = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/nav2d-remote/default.nix b/distros/melodic/nav2d-remote/default.nix index 570194bfa6..5099565ca2 100644 --- a/distros/melodic/nav2d-remote/default.nix +++ b/distros/melodic/nav2d-remote/default.nix @@ -22,6 +22,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 = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/nav2d-tutorials/default.nix b/distros/melodic/nav2d-tutorials/default.nix index a885b17214..ed87c374d6 100644 --- a/distros/melodic/nav2d-tutorials/default.nix +++ b/distros/melodic/nav2d-tutorials/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Contains a set of tutorials that run 2D-Navigation within Stage-Simulator.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/nav2d/default.nix b/distros/melodic/nav2d/default.nix index 443f73a31b..982afaefba 100644 --- a/distros/melodic/nav2d/default.nix +++ b/distros/melodic/nav2d/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Meta-Package containing modules for 2D-Navigation''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/navigation/default.nix b/distros/melodic/navigation/default.nix index c4697833a3..9b7d7cf206 100644 --- a/distros/melodic/navigation/default.nix +++ b/distros/melodic/navigation/default.nix @@ -21,6 +21,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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-LGPL-&-LGPL-amcl-" ]; }; } diff --git a/distros/melodic/network-autoconfig/default.nix b/distros/melodic/network-autoconfig/default.nix index 286321c076..bd2023bc1e 100644 --- a/distros/melodic/network-autoconfig/default.nix +++ b/distros/melodic/network-autoconfig/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ROS Networking Autoconfiguration''; - license = with lib.licenses; [ mit "Apache-1.0" ]; + license = with lib.licenses; [ mit "Apache" ]; }; } diff --git a/distros/melodic/nmea-to-geopose/default.nix b/distros/melodic/nmea-to-geopose/default.nix index 88fd0a8cf6..7aab076bd8 100644 --- a/distros/melodic/nmea-to-geopose/default.nix +++ b/distros/melodic/nmea-to-geopose/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The nmea_to_geopose package''; - license = with lib.licenses; [ "Apachi 2" ]; + license = with lib.licenses; [ asl20 ]; }; } diff --git a/distros/melodic/node-manager-fkie/default.nix b/distros/melodic/node-manager-fkie/default.nix index 6295676780..a4b8ae5cad 100644 --- a/distros/melodic/node-manager-fkie/default.nix +++ b/distros/melodic/node-manager-fkie/default.nix @@ -21,6 +21,6 @@ buildRosPackage { 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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-some-icons-are-licensed-under-LGPL-or-CC-BY-NC-3.0" ]; }; } diff --git a/distros/melodic/novatel-gps-msgs/default.nix b/distros/melodic/novatel-gps-msgs/default.nix index 1952c3e143..640ca4ed90 100644 --- a/distros/melodic/novatel-gps-msgs/default.nix +++ b/distros/melodic/novatel-gps-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Messages for proprietary (non-NMEA) sentences from Novatel GPS receivers.''; - license = with lib.licenses; [ "Southwest Research Institute Proprietary" ]; + license = with lib.licenses; [ "Southwest-Research-Institute-Proprietary" ]; }; } diff --git a/distros/melodic/octovis/default.nix b/distros/melodic/octovis/default.nix index 74a88f1bec..716e4633c6 100644 --- a/distros/melodic/octovis/default.nix +++ b/distros/melodic/octovis/default.nix @@ -20,6 +20,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 = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/melodic/open-karto/default.nix b/distros/melodic/open-karto/default.nix index 64547d4fe4..019504b28c 100644 --- a/distros/melodic/open-karto/default.nix +++ b/distros/melodic/open-karto/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Catkinized ROS packaging of the OpenKarto library''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/openzen-sensor/default.nix b/distros/melodic/openzen-sensor/default.nix index 69d6dcb492..6dd4d21d48 100644 --- a/distros/melodic/openzen-sensor/default.nix +++ b/distros/melodic/openzen-sensor/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''ROS driver for LP-Research OpenZen''; - license = with lib.licenses; [ mit boost lgpl2 bsdOriginal ]; + license = with lib.licenses; [ mit "BSL-1.0" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/melodic/optpp-catkin/default.nix b/distros/melodic/optpp-catkin/default.nix index 8e7fd49d67..e6e0a83b4f 100644 --- a/distros/melodic/optpp-catkin/default.nix +++ b/distros/melodic/optpp-catkin/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The OPT++ catkin wrapper package''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/opw-kinematics/default.nix b/distros/melodic/opw-kinematics/default.nix index 3bb177005c..2f37ee095d 100644 --- a/distros/melodic/opw-kinematics/default.nix +++ b/distros/melodic/opw-kinematics/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, cmake, eigen, gtest, ros-industrial-cmake-boilerplate }: buildRosPackage { pname = "ros-melodic-opw-kinematics"; - version = "0.4.4-r1"; + version = "0.4.5-r1"; src = fetchurl { - url = "https://github.com/ros-industrial-release/opw_kinematics-release/archive/release/melodic/opw_kinematics/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "a9c07bf7cce9ff8248cf00d681099def8d9dc4736f2a4b89ba54fbe3aee17b64"; + url = "https://github.com/ros-industrial-release/opw_kinematics-release/archive/release/melodic/opw_kinematics/0.4.5-1.tar.gz"; + name = "0.4.5-1.tar.gz"; + sha256 = "3708584322d44413993005850d470ca1c32ef10eab0c44d7efa9cc5d950cd7fe"; }; buildType = "cmake"; diff --git a/distros/melodic/orocos-kdl/default.nix b/distros/melodic/orocos-kdl/default.nix index 8e217c8c2b..edaadd9797 100644 --- a/distros/melodic/orocos-kdl/default.nix +++ b/distros/melodic/orocos-kdl/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''This package contains a recent version of the Kinematics and Dynamics Library (KDL), distributed by the Orocos Project.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/orocos-kinematics-dynamics/default.nix b/distros/melodic/orocos-kinematics-dynamics/default.nix index 7deb33ea17..ee74471076 100644 --- a/distros/melodic/orocos-kinematics-dynamics/default.nix +++ b/distros/melodic/orocos-kinematics-dynamics/default.nix @@ -22,6 +22,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 = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/phidgets-drivers/default.nix b/distros/melodic/phidgets-drivers/default.nix index 24b7da68b2..c6fabda0c6 100644 --- a/distros/melodic/phidgets-drivers/default.nix +++ b/distros/melodic/phidgets-drivers/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''API and ROS drivers for Phidgets devices''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-LGPL" ]; }; } diff --git a/distros/melodic/pilz-robot-programming/default.nix b/distros/melodic/pilz-robot-programming/default.nix index 5d4b4fbda1..d8a14b6a0b 100644 --- a/distros/melodic/pilz-robot-programming/default.nix +++ b/distros/melodic/pilz-robot-programming/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''An Easy to use API to execute standard industrial robot commands like Ptp, Lin, Circ and Sequence using Moveit.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/pilz-store-positions/default.nix b/distros/melodic/pilz-store-positions/default.nix index bfc9b43cf8..3fdae20cc9 100644 --- a/distros/melodic/pilz-store-positions/default.nix +++ b/distros/melodic/pilz-store-positions/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Allows to store poses during teach-in.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/pilz-trajectory-generation/default.nix b/distros/melodic/pilz-trajectory-generation/default.nix index 9b8c5dd026..714bb7bbdb 100644 --- a/distros/melodic/pilz-trajectory-generation/default.nix +++ b/distros/melodic/pilz-trajectory-generation/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The pilz_trajectory_generation package containing the MoveIt! plugin pilz_command_planner.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/pinocchio/default.nix b/distros/melodic/pinocchio/default.nix index 30ede15e42..b58772a243 100644 --- a/distros/melodic/pinocchio/default.nix +++ b/distros/melodic/pinocchio/default.nix @@ -2,21 +2,21 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, boost, catkin, cmake, doxygen, eigen, eigenpy, git, python, pythonPackages, urdfdom }: +{ lib, buildRosPackage, fetchurl, boost, catkin, clang, cmake, doxygen, eigen, eigenpy, git, hpp-fcl, python, pythonPackages, urdfdom }: buildRosPackage { pname = "ros-melodic-pinocchio"; - version = "2.6.5-r1"; + version = "2.6.6-r2"; src = fetchurl { - url = "https://github.com/stack-of-tasks/pinocchio-ros-release/archive/release/melodic/pinocchio/2.6.5-1.tar.gz"; - name = "2.6.5-1.tar.gz"; - sha256 = "35f3edd5acf701eeb588bf21b22d2122a4d89267f39ba73ed4994832fc92a77f"; + url = "https://github.com/stack-of-tasks/pinocchio-ros-release/archive/release/melodic/pinocchio/2.6.6-2.tar.gz"; + name = "2.6.6-2.tar.gz"; + sha256 = "88df1ec18a96abc2bd94c926bc2927b30683bcf81de3a3bb28b882f949b0aad5"; }; buildType = "cmake"; buildInputs = [ doxygen git ]; - propagatedBuildInputs = [ boost catkin eigen eigenpy python pythonPackages.numpy urdfdom ]; - nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ boost catkin eigen eigenpy hpp-fcl python pythonPackages.numpy urdfdom ]; + nativeBuildInputs = [ clang cmake ]; meta = { description = ''A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives.''; diff --git a/distros/melodic/plotjuggler-msgs/default.nix b/distros/melodic/plotjuggler-msgs/default.nix index 2c3cf358b1..b289197323 100644 --- a/distros/melodic/plotjuggler-msgs/default.nix +++ b/distros/melodic/plotjuggler-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "2754a3a1a90ad84be9e6e470d5201f7e1e7da603a325b8b082925f84829b33d6"; }; - buildType = "ament_cmake"; + buildType = "catkin"; propagatedBuildInputs = [ message-generation message-runtime std-msgs ]; nativeBuildInputs = [ catkin ]; diff --git a/distros/melodic/plotjuggler-ros/default.nix b/distros/melodic/plotjuggler-ros/default.nix index 06dd0a6399..1be0be0586 100644 --- a/distros/melodic/plotjuggler-ros/default.nix +++ b/distros/melodic/plotjuggler-ros/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''PlotJuggler plugin for ROS''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "AGPLv3" ]; }; } diff --git a/distros/melodic/plotjuggler/default.nix b/distros/melodic/plotjuggler/default.nix index 4922a4f382..a0aa939699 100644 --- a/distros/melodic/plotjuggler/default.nix +++ b/distros/melodic/plotjuggler/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''PlotJuggler: juggle with data''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/polar-scan-matcher/default.nix b/distros/melodic/polar-scan-matcher/default.nix index b3e9056b8c..eb0f1057d0 100644 --- a/distros/melodic/polar-scan-matcher/default.nix +++ b/distros/melodic/polar-scan-matcher/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''

A wrapper around Polar Scan Matcher by Albert Diosi and Lindsay Kleeman, used for laser scan registration.

''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/pr2-calibration/default.nix b/distros/melodic/pr2-calibration/default.nix index b130dc1273..f775cb6c3f 100644 --- a/distros/melodic/pr2-calibration/default.nix +++ b/distros/melodic/pr2-calibration/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The pr2_calibration package''; - license = with lib.licenses; [ "TODO" ]; + license = with lib.licenses; [ "TODO-CATKIN-PACKAGE-LICENSE" ]; }; } diff --git a/distros/melodic/pr2-ethercat-drivers/default.nix b/distros/melodic/pr2-ethercat-drivers/default.nix index 4efcd017c0..e2c47e9919 100644 --- a/distros/melodic/pr2-ethercat-drivers/default.nix +++ b/distros/melodic/pr2-ethercat-drivers/default.nix @@ -21,6 +21,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 = with lib.licenses; [ bsdOriginal gpl1 ]; + license = with lib.licenses; [ bsdOriginal "GPL" ]; }; } diff --git a/distros/melodic/pr2-self-test/default.nix b/distros/melodic/pr2-self-test/default.nix index 7725cbd91b..65f30f57c6 100644 --- a/distros/melodic/pr2-self-test/default.nix +++ b/distros/melodic/pr2-self-test/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The pr2_self_test package''; - license = with lib.licenses; [ "TODO" ]; + license = with lib.licenses; [ "TODO-CATKIN-PACKAGE-LICENSE" ]; }; } diff --git a/distros/melodic/pr2-teleop/default.nix b/distros/melodic/pr2-teleop/default.nix index 7ed3d5d066..cedbd03418 100644 --- a/distros/melodic/pr2-teleop/default.nix +++ b/distros/melodic/pr2-teleop/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The pr2_teleop package''; - license = with lib.licenses; [ "TODO" ]; + license = with lib.licenses; [ "TODO-CATKIN-PACKAGE-LICENSE" ]; }; } diff --git a/distros/melodic/prbt-hardware-support/default.nix b/distros/melodic/prbt-hardware-support/default.nix index 9fb59ca52f..15a664e744 100644 --- a/distros/melodic/prbt-hardware-support/default.nix +++ b/distros/melodic/prbt-hardware-support/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Control hardware functions of the PRBT manipulator like RUN_PERMITTED for Stop1 functionality.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/psen-scan-v2/default.nix b/distros/melodic/psen-scan-v2/default.nix index e90d59b3dc..c7d5a745d7 100644 --- a/distros/melodic/psen-scan-v2/default.nix +++ b/distros/melodic/psen-scan-v2/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''ROS support for the Pilz laser scanner''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/psen-scan/default.nix b/distros/melodic/psen-scan/default.nix index 7d4a31b5fa..d0b10eba4b 100644 --- a/distros/melodic/psen-scan/default.nix +++ b/distros/melodic/psen-scan/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The psen_scan package for Pilz laser scanner''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/px4-msgs/default.nix b/distros/melodic/px4-msgs/default.nix index a1f7571159..6963b81f12 100644 --- a/distros/melodic/px4-msgs/default.nix +++ b/distros/melodic/px4-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Package with the ROS-equivalent of PX4 uORB msgs''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/python-orocos-kdl/default.nix b/distros/melodic/python-orocos-kdl/default.nix index fa40b43c33..e381a8406b 100644 --- a/distros/melodic/python-orocos-kdl/default.nix +++ b/distros/melodic/python-orocos-kdl/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package contains the python bindings PyKDL for the Kinematics and Dynamics Library (KDL), distributed by the Orocos Project.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/qb-chain-control/default.nix b/distros/melodic/qb-chain-control/default.nix index 78e6010bcf..d84222a482 100644 --- a/distros/melodic/qb-chain-control/default.nix +++ b/distros/melodic/qb-chain-control/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS node to control multiple qbrobotics® devices simultaneously.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-chain-controllers/default.nix b/distros/melodic/qb-chain-controllers/default.nix index dcc1ff2731..5fafba54f6 100644 --- a/distros/melodic/qb-chain-controllers/default.nix +++ b/distros/melodic/qb-chain-controllers/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains the specific controllers for qbrobotics® kinematic structures, e.g. the qbdelta controller.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-chain-description/default.nix b/distros/melodic/qb-chain-description/default.nix index 1e86026eb2..19115d8b7e 100644 --- a/distros/melodic/qb-chain-description/default.nix +++ b/distros/melodic/qb-chain-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS description for complex chains of qbrobotics® devices.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-chain-msgs/default.nix b/distros/melodic/qb-chain-msgs/default.nix index 3ac95ce584..32660897ef 100644 --- a/distros/melodic/qb-chain-msgs/default.nix +++ b/distros/melodic/qb-chain-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''message to control end-effector pose, robot sitiffness and velocity''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-chain/default.nix b/distros/melodic/qb-chain/default.nix index 24f914052b..3aee164087 100644 --- a/distros/melodic/qb-chain/default.nix +++ b/distros/melodic/qb-chain/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS interface to control multiple qbrobotics® devices simultaneously.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-device-bringup/default.nix b/distros/melodic/qb-device-bringup/default.nix index d72a1a5096..b6ad49e176 100644 --- a/distros/melodic/qb-device-bringup/default.nix +++ b/distros/melodic/qb-device-bringup/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains a device-independent bringup utilities for qbrobotics® devices.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-device-control/default.nix b/distros/melodic/qb-device-control/default.nix index 35fb1ef907..5a471c4c51 100644 --- a/distros/melodic/qb-device-control/default.nix +++ b/distros/melodic/qb-device-control/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains a device-independent control library for qbrobotics® devices.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-device-description/default.nix b/distros/melodic/qb-device-description/default.nix index fd0c859ac8..509733aeb3 100644 --- a/distros/melodic/qb-device-description/default.nix +++ b/distros/melodic/qb-device-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains a device-independent description utilities for qbrobotics® devices.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-device-driver/default.nix b/distros/melodic/qb-device-driver/default.nix index 9ec6a855c7..26c8499ca5 100644 --- a/distros/melodic/qb-device-driver/default.nix +++ b/distros/melodic/qb-device-driver/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains a device-independent API wrapper for qbrobotics® devices.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-device-hardware-interface/default.nix b/distros/melodic/qb-device-hardware-interface/default.nix index b855a67a04..09742bfefb 100644 --- a/distros/melodic/qb-device-hardware-interface/default.nix +++ b/distros/melodic/qb-device-hardware-interface/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package contains a device-independent hardware interface for qbrobotics® devices.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-device-msgs/default.nix b/distros/melodic/qb-device-msgs/default.nix index f1cbb92847..b6f964f0c8 100644 --- a/distros/melodic/qb-device-msgs/default.nix +++ b/distros/melodic/qb-device-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package contains the device-independent custom ROS messages for qbrobotics® devices.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-device-srvs/default.nix b/distros/melodic/qb-device-srvs/default.nix index cf6279c6c5..ceb53cc332 100644 --- a/distros/melodic/qb-device-srvs/default.nix +++ b/distros/melodic/qb-device-srvs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package contains the device-independent custom ROS services for qbrobotics® devices.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-device-utils/default.nix b/distros/melodic/qb-device-utils/default.nix index 6741303fc1..8882719833 100644 --- a/distros/melodic/qb-device-utils/default.nix +++ b/distros/melodic/qb-device-utils/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains a device-independent utility functions for qbrobotics® devices.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-device/default.nix b/distros/melodic/qb-device/default.nix index 9cdda32636..c93eb3efb8 100644 --- a/distros/melodic/qb-device/default.nix +++ b/distros/melodic/qb-device/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains a device-independent ROS interface for qbrobotics® devices.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-hand-control/default.nix b/distros/melodic/qb-hand-control/default.nix index ee03f3d5fc..4c675abe7d 100644 --- a/distros/melodic/qb-hand-control/default.nix +++ b/distros/melodic/qb-hand-control/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS control node for qbrobotics® qbhand device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-hand-description/default.nix b/distros/melodic/qb-hand-description/default.nix index b1b34b3471..5b0294538b 100644 --- a/distros/melodic/qb-hand-description/default.nix +++ b/distros/melodic/qb-hand-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS description for qbrobotics® qbhand device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-hand-hardware-interface/default.nix b/distros/melodic/qb-hand-hardware-interface/default.nix index aa53c7a8ab..1861af3153 100644 --- a/distros/melodic/qb-hand-hardware-interface/default.nix +++ b/distros/melodic/qb-hand-hardware-interface/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains the hardware interface for qbrobotics® qbhand device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-hand/default.nix b/distros/melodic/qb-hand/default.nix index 4fe6deadeb..9ccfb3c313 100644 --- a/distros/melodic/qb-hand/default.nix +++ b/distros/melodic/qb-hand/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS interface for qbrobotics® qbhand device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-move-control/default.nix b/distros/melodic/qb-move-control/default.nix index abb0fa6f15..86051ddfc9 100644 --- a/distros/melodic/qb-move-control/default.nix +++ b/distros/melodic/qb-move-control/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS control node for qbrobotics® qbmove device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-move-description/default.nix b/distros/melodic/qb-move-description/default.nix index 626f5938c8..fb9d871ead 100644 --- a/distros/melodic/qb-move-description/default.nix +++ b/distros/melodic/qb-move-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS description for qbrobotics® qbmove device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-move-hardware-interface/default.nix b/distros/melodic/qb-move-hardware-interface/default.nix index 36fd81b54d..109417bc48 100644 --- a/distros/melodic/qb-move-hardware-interface/default.nix +++ b/distros/melodic/qb-move-hardware-interface/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains the hardware interface for qbrobotics® qbmove device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qb-move/default.nix b/distros/melodic/qb-move/default.nix index 5647603a63..c195d7b814 100644 --- a/distros/melodic/qb-move/default.nix +++ b/distros/melodic/qb-move/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS interface for qbrobotics® qbmove device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/qpoases-vendor/default.nix b/distros/melodic/qpoases-vendor/default.nix index 0d4e5ccbb7..44796d4905 100644 --- a/distros/melodic/qpoases-vendor/default.nix +++ b/distros/melodic/qpoases-vendor/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Wrapper around qpOASES to make it available to the ROS ecosystem.''; - license = with lib.licenses; [ asl20 lgpl2 ]; + license = with lib.licenses; [ asl20 "LGPL" ]; }; } diff --git a/distros/melodic/qt-qmake/default.nix b/distros/melodic/qt-qmake/default.nix index bab852c5b9..60d4ed2ea3 100644 --- a/distros/melodic/qt-qmake/default.nix +++ b/distros/melodic/qt-qmake/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''qt*-qmake metapackage supporting qt4 and qt5''; - license = with lib.licenses; [ "United States Government Purpose" "SwRI Proprietary" ]; + license = with lib.licenses; [ "United-States-Government-Purpose" "SwRI-Proprietary" ]; }; } diff --git a/distros/melodic/radar-omnipresense/default.nix b/distros/melodic/radar-omnipresense/default.nix index 2abd51aae0..3107a0cdb6 100644 --- a/distros/melodic/radar-omnipresense/default.nix +++ b/distros/melodic/radar-omnipresense/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This is the radar driver package developed for the omnipresense radar module.''; - license = with lib.licenses; [ "ECL2.0" ]; + license = with lib.licenses; [ "EPL-2.0" ]; }; } diff --git a/distros/melodic/rail-mesh-icp/default.nix b/distros/melodic/rail-mesh-icp/default.nix index eed32d7d31..b13c6655a1 100644 --- a/distros/melodic/rail-mesh-icp/default.nix +++ b/distros/melodic/rail-mesh-icp/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Enables matching a mesh model file (e.g. STL) to a point cloud using ROS.''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-2-Clause" ]; }; } diff --git a/distros/melodic/razor-imu-9dof/default.nix b/distros/melodic/razor-imu-9dof/default.nix index 695a50978e..88f54e8ed1 100644 --- a/distros/melodic/razor-imu-9dof/default.nix +++ b/distros/melodic/razor-imu-9dof/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''razor_imu_9dof is a package that provides a ROS driver for the Sparkfun OpenLog Artemis, 9DoF Razor IMU M0, 9DOF Razor IMU and 9DOF Sensor Stick. It also provides Arduino firmware that runs on the board, and which must be installed on it for the system to work. A node which displays the attitude (roll, pitch and yaw) of the board (or any IMU) is provided for testing.''; - license = with lib.licenses; [ bsdOriginal gpl3 ]; + license = with lib.licenses; [ bsdOriginal "GPL-3.0-only" ]; }; } diff --git a/distros/melodic/rdl-benchmark/default.nix b/distros/melodic/rdl-benchmark/default.nix index cc671b5dea..d63d6244dd 100644 --- a/distros/melodic/rdl-benchmark/default.nix +++ b/distros/melodic/rdl-benchmark/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "3.2.0-r1"; src = fetchurl { - url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl_benchmark/3.2.0-1/rdl_release-release-melodic-rdl_benchmark-3.2.0-1.tar.gz"; - name = "rdl_release-release-melodic-rdl_benchmark-3.2.0-1.tar.gz"; - sha256 = "d351794b18247cd31330fe3a9d7a84cd41c5bd8b65b3f9ed11a9abae582fed82"; + url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl_benchmark/3.2.0-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "b3764041b76d8541b11d5acdb176bed3be086ec1b953a41aa2b56b42898d34aa"; }; buildType = "catkin"; @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The rdl_benchmark package''; - license = with lib.licenses; [ "zlib" ]; + license = with lib.licenses; [ "Zlib" ]; }; } diff --git a/distros/melodic/rdl-cmake/default.nix b/distros/melodic/rdl-cmake/default.nix index 09c092318e..759307a8f5 100644 --- a/distros/melodic/rdl-cmake/default.nix +++ b/distros/melodic/rdl-cmake/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "3.2.0-r1"; src = fetchurl { - url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl_cmake/3.2.0-1/rdl_release-release-melodic-rdl_cmake-3.2.0-1.tar.gz"; - name = "rdl_release-release-melodic-rdl_cmake-3.2.0-1.tar.gz"; - sha256 = "30c5695aa0bb0847d991d05020be78e50d5795c51b832eeb17990da8c0488bc2"; + url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl_cmake/3.2.0-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "dd87bce11db76a5bd23cb7919bd886b93bb97b99df3396b824b6132619dacb7e"; }; buildType = "catkin"; @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The rdl_cmake package''; - license = with lib.licenses; [ "zlib" ]; + license = with lib.licenses; [ "Zlib" ]; }; } diff --git a/distros/melodic/rdl-dynamics/default.nix b/distros/melodic/rdl-dynamics/default.nix index 98f29ff3a0..ca5769f31c 100644 --- a/distros/melodic/rdl-dynamics/default.nix +++ b/distros/melodic/rdl-dynamics/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "3.2.0-r1"; src = fetchurl { - url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl_dynamics/3.2.0-1/rdl_release-release-melodic-rdl_dynamics-3.2.0-1.tar.gz"; - name = "rdl_release-release-melodic-rdl_dynamics-3.2.0-1.tar.gz"; - sha256 = "85053786c16693de1bd832d6f81307d41d63b593e2f2b54cd32d8adca0a03bf1"; + url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl_dynamics/3.2.0-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "02996f90bf325b1c47f8b436761468a0af9662aa937ec90250cf10ecd7107fa0"; }; buildType = "catkin"; @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The rdl_dynamics package''; - license = with lib.licenses; [ "zlib" ]; + license = with lib.licenses; [ "Zlib" ]; }; } diff --git a/distros/melodic/rdl-msgs/default.nix b/distros/melodic/rdl-msgs/default.nix index 42fb1e61f0..1025d735b7 100644 --- a/distros/melodic/rdl-msgs/default.nix +++ b/distros/melodic/rdl-msgs/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "3.2.0-r1"; src = fetchurl { - url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl_msgs/3.2.0-1/rdl_release-release-melodic-rdl_msgs-3.2.0-1.tar.gz"; - name = "rdl_release-release-melodic-rdl_msgs-3.2.0-1.tar.gz"; - sha256 = "e51406d626a0114ed044ee5e90462bc10737ed057a5abf50f808fdea52cd6ddf"; + url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl_msgs/3.2.0-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "338e4d203d43511f7232d2528f44364d36c739eb86f5de1b791e68ea2e9273d2"; }; buildType = "catkin"; @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Custom msgs for rdl types''; - license = with lib.licenses; [ "zlib" ]; + license = with lib.licenses; [ "Zlib" ]; }; } diff --git a/distros/melodic/rdl-ros-tools/default.nix b/distros/melodic/rdl-ros-tools/default.nix index d9dd36b33a..ac36badfbf 100644 --- a/distros/melodic/rdl-ros-tools/default.nix +++ b/distros/melodic/rdl-ros-tools/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "3.2.0-r1"; src = fetchurl { - url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl_ros_tools/3.2.0-1/rdl_release-release-melodic-rdl_ros_tools-3.2.0-1.tar.gz"; - name = "rdl_release-release-melodic-rdl_ros_tools-3.2.0-1.tar.gz"; - sha256 = "36c236da8fa738216e65211f173f73a203d2b99a582e396aabf170e26d841483"; + url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl_ros_tools/3.2.0-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "3d535dc2d58a675a64d78d2b30820586f00b16e350008e146e9ac19415e0c926"; }; buildType = "catkin"; @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ROS interface into rdl tools''; - license = with lib.licenses; [ "zlib" ]; + license = with lib.licenses; [ "Zlib" ]; }; } diff --git a/distros/melodic/rdl-urdfreader/default.nix b/distros/melodic/rdl-urdfreader/default.nix index 639e8ad7d0..bfe1b37161 100644 --- a/distros/melodic/rdl-urdfreader/default.nix +++ b/distros/melodic/rdl-urdfreader/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "3.2.0-r1"; src = fetchurl { - url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl_urdfreader/3.2.0-1/rdl_release-release-melodic-rdl_urdfreader-3.2.0-1.tar.gz"; - name = "rdl_release-release-melodic-rdl_urdfreader-3.2.0-1.tar.gz"; - sha256 = "21e9d728f57fa66aa13948bb25fd1900aa5926410fe533b6e92da0f8acf00ffa"; + url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl_urdfreader/3.2.0-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "acf08d42afc98a4ffb76a16dfc67124f19f3adeb56167f886322019cb3fc83ee"; }; buildType = "catkin"; @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The rdl_urdfreader package''; - license = with lib.licenses; [ "zlib" ]; + license = with lib.licenses; [ "Zlib" ]; }; } diff --git a/distros/melodic/rdl/default.nix b/distros/melodic/rdl/default.nix index eb1e854885..3adda8b69a 100644 --- a/distros/melodic/rdl/default.nix +++ b/distros/melodic/rdl/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "3.2.0-r1"; src = fetchurl { - url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl/3.2.0-1/rdl_release-release-melodic-rdl-3.2.0-1.tar.gz"; - name = "rdl_release-release-melodic-rdl-3.2.0-1.tar.gz"; - sha256 = "402f1c9db58df28b9506bff1ae06cafb299e6a076cb46a1bc44f8bfc9019436e"; + url = "https://gitlab.com/jlack/rdl_release/-/archive/release/melodic/rdl/3.2.0-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "697a892941f85b37eb08270936b94605ef7745c4aa2f7788f64b1a4974b5bf46"; }; buildType = "catkin"; @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The rdl meta-package''; - license = with lib.licenses; [ "zlib" ]; + license = with lib.licenses; [ "Zlib" ]; }; } diff --git a/distros/melodic/rocon-ebnf/default.nix b/distros/melodic/rocon-ebnf/default.nix index 411bbb3f63..234009d00b 100644 --- a/distros/melodic/rocon-ebnf/default.nix +++ b/distros/melodic/rocon-ebnf/default.nix @@ -22,6 +22,6 @@ buildRosPackage { description = ''Internal packaging of the 0.91 version of the simple python EBNF parser written by LParis.''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/rocon-python-wifi/default.nix b/distros/melodic/rocon-python-wifi/default.nix index d9226d2ff7..b282840224 100644 --- a/distros/melodic/rocon-python-wifi/default.nix +++ b/distros/melodic/rocon-python-wifi/default.nix @@ -21,6 +21,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 = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/melodic/rokubimini-bus-manager/default.nix b/distros/melodic/rokubimini-bus-manager/default.nix index ec9100e16f..82e7561f14 100644 --- a/distros/melodic/rokubimini-bus-manager/default.nix +++ b/distros/melodic/rokubimini-bus-manager/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r1"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/rokubimini_bus_manager/0.6.1-1/bota_driver-release-release-melodic-rokubimini_bus_manager-0.6.1-1.tar.gz"; - name = "bota_driver-release-release-melodic-rokubimini_bus_manager-0.6.1-1.tar.gz"; - sha256 = "c1183bd1a9fa9877b99d9c193cd8274f039d16c9bcf268d33b77d8fcbd0c00d4"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/rokubimini_bus_manager/0.6.1-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "959832b0c624517b30028c18322fe0d2e30e01677bc05f2cf9c8a89ceb225994"; }; buildType = "catkin"; diff --git a/distros/melodic/rokubimini-description/default.nix b/distros/melodic/rokubimini-description/default.nix index 021acce199..336f787726 100644 --- a/distros/melodic/rokubimini-description/default.nix +++ b/distros/melodic/rokubimini-description/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r1"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/rokubimini_description/0.6.1-1/bota_driver-release-release-melodic-rokubimini_description-0.6.1-1.tar.gz"; - name = "bota_driver-release-release-melodic-rokubimini_description-0.6.1-1.tar.gz"; - sha256 = "59668d594bd3c32d2b2a0510e3afa31e42f248658f296600d2d7528b9950f6cd"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/rokubimini_description/0.6.1-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "a85ed07da56c756ef67f2a16b36b5669b3ca3e09e6d7ef4243aa2fc5f0690e97"; }; buildType = "catkin"; diff --git a/distros/melodic/rokubimini-ethercat/default.nix b/distros/melodic/rokubimini-ethercat/default.nix index 0e75b2aa53..b0ddc4c6b5 100644 --- a/distros/melodic/rokubimini-ethercat/default.nix +++ b/distros/melodic/rokubimini-ethercat/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r1"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/rokubimini_ethercat/0.6.1-1/bota_driver-release-release-melodic-rokubimini_ethercat-0.6.1-1.tar.gz"; - name = "bota_driver-release-release-melodic-rokubimini_ethercat-0.6.1-1.tar.gz"; - sha256 = "0d8913768f976284fb54f975cca09d060a05fd26c0c405508343491c055e4c8a"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/rokubimini_ethercat/0.6.1-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "70fa8c1fb508538a0a3b9f08ad6a0064eaff44448ae75384fc5e8af794c1e1de"; }; buildType = "catkin"; diff --git a/distros/melodic/rokubimini-msgs/default.nix b/distros/melodic/rokubimini-msgs/default.nix index 54d423f11f..a6a12c7923 100644 --- a/distros/melodic/rokubimini-msgs/default.nix +++ b/distros/melodic/rokubimini-msgs/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r1"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/rokubimini_msgs/0.6.1-1/bota_driver-release-release-melodic-rokubimini_msgs-0.6.1-1.tar.gz"; - name = "bota_driver-release-release-melodic-rokubimini_msgs-0.6.1-1.tar.gz"; - sha256 = "2a50234d0be498b0a6cb8f7775907ace7436c99b271e3276b959ba8b6341b893"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/rokubimini_msgs/0.6.1-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "c7a1307e24aa8bca74a820833d07bd2e6c2a05804de3161c4dcdea338f0d9dc9"; }; buildType = "catkin"; diff --git a/distros/melodic/rokubimini-serial/default.nix b/distros/melodic/rokubimini-serial/default.nix index c9ee34fa15..5183a04633 100644 --- a/distros/melodic/rokubimini-serial/default.nix +++ b/distros/melodic/rokubimini-serial/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r1"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/rokubimini_serial/0.6.1-1/bota_driver-release-release-melodic-rokubimini_serial-0.6.1-1.tar.gz"; - name = "bota_driver-release-release-melodic-rokubimini_serial-0.6.1-1.tar.gz"; - sha256 = "03189c95343c384a677014c7dcc1ec55a3657a813a5b72b9cc13a88b7ff49d22"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/rokubimini_serial/0.6.1-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "8b62a8b217a85e6d5c975be57628937882a70dfbe6f0ac8eb23fee9f0f28403a"; }; buildType = "catkin"; diff --git a/distros/melodic/rokubimini/default.nix b/distros/melodic/rokubimini/default.nix index 69231b4fbd..04d86e5314 100644 --- a/distros/melodic/rokubimini/default.nix +++ b/distros/melodic/rokubimini/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r1"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/rokubimini/0.6.1-1/bota_driver-release-release-melodic-rokubimini-0.6.1-1.tar.gz"; - name = "bota_driver-release-release-melodic-rokubimini-0.6.1-1.tar.gz"; - sha256 = "4408f8c802a771910831719bcf8f084af00db22d9272b2dfa248f20953abfbb6"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/melodic/rokubimini/0.6.1-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "61beb85b1bfe05890a54abbdf73c274533ea708be0d6b2255ad3b56f6e2b806f"; }; buildType = "catkin"; diff --git a/distros/melodic/ros-canopen/default.nix b/distros/melodic/ros-canopen/default.nix index 039aeee6ed..a5add7f51a 100644 --- a/distros/melodic/ros-canopen/default.nix +++ b/distros/melodic/ros-canopen/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''A generic canopen implementation for ROS''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/ros-ethercat-eml/default.nix b/distros/melodic/ros-ethercat-eml/default.nix index 6ad4a5cce5..678b28c8df 100644 --- a/distros/melodic/ros-ethercat-eml/default.nix +++ b/distros/melodic/ros-ethercat-eml/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This is an implementation of the EtherCAT master protocol for use wiht ros_ethercar package based on the work done at Flanders' Mechatronics Technology Centre and Willow Garage.''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/ros-industrial-cmake-boilerplate/default.nix b/distros/melodic/ros-industrial-cmake-boilerplate/default.nix index 636c17b7a1..1727ebba24 100644 --- a/distros/melodic/ros-industrial-cmake-boilerplate/default.nix +++ b/distros/melodic/ros-industrial-cmake-boilerplate/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Contains boilerplate cmake script, macros and utils''; - license = with lib.licenses; [ asl20 bsdOriginal ]; + license = with lib.licenses; [ asl20 "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/ros-realtime/default.nix b/distros/melodic/ros-realtime/default.nix index c73ae296f8..1cb93b1ebe 100644 --- a/distros/melodic/ros-realtime/default.nix +++ b/distros/melodic/ros-realtime/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The ros_realtime package''; - license = with lib.licenses; [ "TODO" ]; + license = with lib.licenses; [ "TODO-CATKIN-PACKAGE-LICENSE" ]; }; } diff --git a/distros/melodic/ros-reflexxes/default.nix b/distros/melodic/ros-reflexxes/default.nix index 7e2424c44a..3bbac4520d 100644 --- a/distros/melodic/ros-reflexxes/default.nix +++ b/distros/melodic/ros-reflexxes/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The ros_reflexxes package''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/rosatomic/default.nix b/distros/melodic/rosatomic/default.nix index 66d5c56082..2711000f20 100644 --- a/distros/melodic/rosatomic/default.nix +++ b/distros/melodic/rosatomic/default.nix @@ -20,6 +20,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 = with lib.licenses; [ bsdOriginal boost ]; + license = with lib.licenses; [ bsdOriginal "BSL-1.0" ]; }; } diff --git a/distros/melodic/roslisp-repl/default.nix b/distros/melodic/roslisp-repl/default.nix index 96cedb52a6..6ec1a3edcb 100644 --- a/distros/melodic/roslisp-repl/default.nix +++ b/distros/melodic/roslisp-repl/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''This package provides a script that launches Emacs with Slime (the Superior Lisp Interaction Mode) ready for Lisp development and roslisp.''; - license = with lib.licenses; [ publicDomain ]; + license = with lib.licenses; [ "PD" ]; }; } diff --git a/distros/melodic/rosping/default.nix b/distros/melodic/rosping/default.nix index a959bd33f3..019a577641 100644 --- a/distros/melodic/rosping/default.nix +++ b/distros/melodic/rosping/default.nix @@ -21,6 +21,6 @@ buildRosPackage { 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 = with lib.licenses; [ boost ]; + license = with lib.licenses; [ "BSL-1.0" ]; }; } diff --git a/distros/melodic/rotors-comm/default.nix b/distros/melodic/rotors-comm/default.nix index 0901e280f0..e685f4d3d2 100644 --- a/distros/melodic/rotors-comm/default.nix +++ b/distros/melodic/rotors-comm/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''RotorS specific messages and services.''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/rotors-control/default.nix b/distros/melodic/rotors-control/default.nix index 4e09ec66cb..1412472203 100644 --- a/distros/melodic/rotors-control/default.nix +++ b/distros/melodic/rotors-control/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''RotorS control package''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/rotors-description/default.nix b/distros/melodic/rotors-description/default.nix index 729dfc566f..d0b1885116 100644 --- a/distros/melodic/rotors-description/default.nix +++ b/distros/melodic/rotors-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The rotors_description package provides URDF models of the AscTec multicopters.''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/rotors-evaluation/default.nix b/distros/melodic/rotors-evaluation/default.nix index ae9a28769e..2f4b9a992b 100644 --- a/distros/melodic/rotors-evaluation/default.nix +++ b/distros/melodic/rotors-evaluation/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The dataset evaluation package for the RotorS simulator.''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/rotors-gazebo-plugins/default.nix b/distros/melodic/rotors-gazebo-plugins/default.nix index 8dc455a7d1..d1a54c7bc3 100644 --- a/distros/melodic/rotors-gazebo-plugins/default.nix +++ b/distros/melodic/rotors-gazebo-plugins/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The rotors_gazebo_plugins package''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/rotors-gazebo/default.nix b/distros/melodic/rotors-gazebo/default.nix index b93f367bf4..9cbb92a296 100644 --- a/distros/melodic/rotors-gazebo/default.nix +++ b/distros/melodic/rotors-gazebo/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The rotors_gazebo package''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/rotors-hil-interface/default.nix b/distros/melodic/rotors-hil-interface/default.nix index adb2d424ef..3f24a49fce 100644 --- a/distros/melodic/rotors-hil-interface/default.nix +++ b/distros/melodic/rotors-hil-interface/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''RotorS Hardware-in-the-loop interface package''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/rotors-joy-interface/default.nix b/distros/melodic/rotors-joy-interface/default.nix index 66ec0aebaf..8b3fb897d2 100644 --- a/distros/melodic/rotors-joy-interface/default.nix +++ b/distros/melodic/rotors-joy-interface/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The rotors_joy_interface package to control MAVs with a joystick''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/rotors-simulator/default.nix b/distros/melodic/rotors-simulator/default.nix index d4d9a9f691..a3f33fec29 100644 --- a/distros/melodic/rotors-simulator/default.nix +++ b/distros/melodic/rotors-simulator/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''RotorS is a MAV gazebo simulator.''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/rqt-gui-cpp/default.nix b/distros/melodic/rqt-gui-cpp/default.nix index dcb7450c21..1529548f6f 100644 --- a/distros/melodic/rqt-gui-cpp/default.nix +++ b/distros/melodic/rqt-gui-cpp/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, nodelet, qt-gui, qt-gui-cpp, qt5, roscpp }: buildRosPackage { pname = "ros-melodic-rqt-gui-cpp"; - version = "0.5.2-r1"; + version = "0.5.3-r1"; src = fetchurl { - url = "https://github.com/ros-gbp/rqt-release/archive/release/melodic/rqt_gui_cpp/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "2b1a17e25f960b71148a92baab5bfb19d8247788dbef53ec5bc9aa0c1d56832b"; + url = "https://github.com/ros-gbp/rqt-release/archive/release/melodic/rqt_gui_cpp/0.5.3-1.tar.gz"; + name = "0.5.3-1.tar.gz"; + sha256 = "65ee396bb3941ccfd248b8357c082ce3ba37d3b68e634143e2af493a79c1227e"; }; buildType = "catkin"; diff --git a/distros/melodic/rqt-gui-py/default.nix b/distros/melodic/rqt-gui-py/default.nix index bbaf09f183..b06410c047 100644 --- a/distros/melodic/rqt-gui-py/default.nix +++ b/distros/melodic/rqt-gui-py/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, qt-gui, rospy, rqt-gui }: buildRosPackage { pname = "ros-melodic-rqt-gui-py"; - version = "0.5.2-r1"; + version = "0.5.3-r1"; src = fetchurl { - url = "https://github.com/ros-gbp/rqt-release/archive/release/melodic/rqt_gui_py/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "19e890bbce211050398d6eacf2298a2bbb92fd47b7ed3e91278b45b8044ca596"; + url = "https://github.com/ros-gbp/rqt-release/archive/release/melodic/rqt_gui_py/0.5.3-1.tar.gz"; + name = "0.5.3-1.tar.gz"; + sha256 = "e674a55bdf18c63086832699590e7948da1021e8d56a89b0c79a68acb2c00799"; }; buildType = "catkin"; diff --git a/distros/melodic/rqt-gui/default.nix b/distros/melodic/rqt-gui/default.nix index c9c8df93d6..31265d102b 100644 --- a/distros/melodic/rqt-gui/default.nix +++ b/distros/melodic/rqt-gui/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, qt-gui, rospy }: buildRosPackage { pname = "ros-melodic-rqt-gui"; - version = "0.5.2-r1"; + version = "0.5.3-r1"; src = fetchurl { - url = "https://github.com/ros-gbp/rqt-release/archive/release/melodic/rqt_gui/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "58c5fb5f561a860a826298b4b368df4bb865ed44c79f077f437bddf3436f27cb"; + url = "https://github.com/ros-gbp/rqt-release/archive/release/melodic/rqt_gui/0.5.3-1.tar.gz"; + name = "0.5.3-1.tar.gz"; + sha256 = "89fb23e6d891b970dbe755a18c3fd92603bfdea4b7d6e75ed3dfb380e55ed8e5"; }; buildType = "catkin"; diff --git a/distros/melodic/rqt-multiplot/default.nix b/distros/melodic/rqt-multiplot/default.nix index 6e11eac0df..6c21f5b52b 100644 --- a/distros/melodic/rqt-multiplot/default.nix +++ b/distros/melodic/rqt-multiplot/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''rqt_multiplot provides a GUI plugin for visualizing numeric values in multiple 2D plots using the Qwt plotting backend.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "GNU-Lesser-General-Public-License-LGPL-" ]; }; } diff --git a/distros/melodic/rqt-py-common/default.nix b/distros/melodic/rqt-py-common/default.nix index 7eebdc3515..3428b16167 100644 --- a/distros/melodic/rqt-py-common/default.nix +++ b/distros/melodic/rqt-py-common/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, actionlib, catkin, genmsg, genpy, python-qt-binding, qt-gui, rosbag, roslib, rospy, rostopic, std-msgs }: buildRosPackage { pname = "ros-melodic-rqt-py-common"; - version = "0.5.2-r1"; + version = "0.5.3-r1"; src = fetchurl { - url = "https://github.com/ros-gbp/rqt-release/archive/release/melodic/rqt_py_common/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "8c59891fcdbf11af9c98cc0ad0b3248a35250d781bf855c3d0d48f27d67a70ff"; + url = "https://github.com/ros-gbp/rqt-release/archive/release/melodic/rqt_py_common/0.5.3-1.tar.gz"; + name = "0.5.3-1.tar.gz"; + sha256 = "7a2326df173b225e7f9033904fad9d30b3efc55fb94cd23fcfd75c4e094d5fa0"; }; buildType = "catkin"; diff --git a/distros/melodic/rqt-robot-monitor/default.nix b/distros/melodic/rqt-robot-monitor/default.nix index d693504ead..64125442f2 100644 --- a/distros/melodic/rqt-robot-monitor/default.nix +++ b/distros/melodic/rqt-robot-monitor/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, diagnostic-msgs, python-qt-binding, pythonPackages, qt-gui, qt-gui-py-common, rospy, rqt-bag, rqt-gui, rqt-gui-py, rqt-py-common }: buildRosPackage { pname = "ros-melodic-rqt-robot-monitor"; - version = "0.5.13-r1"; + version = "0.5.14-r1"; src = fetchurl { - url = "https://github.com/ros-gbp/rqt_robot_monitor-release/archive/release/melodic/rqt_robot_monitor/0.5.13-1.tar.gz"; - name = "0.5.13-1.tar.gz"; - sha256 = "e77c163447c085b75b36d89c0f8a06b52f44efa1ba470c5cb2e0aef5a03adb6b"; + url = "https://github.com/ros-gbp/rqt_robot_monitor-release/archive/release/melodic/rqt_robot_monitor/0.5.14-1.tar.gz"; + name = "0.5.14-1.tar.gz"; + sha256 = "914de4f23e33719f90164020750d84e1445f37c7abfef9b477927235eae3b527"; }; buildType = "catkin"; diff --git a/distros/melodic/rqt-rotors/default.nix b/distros/melodic/rqt-rotors/default.nix index 2a27a923f4..c8b7414395 100644 --- a/distros/melodic/rqt-rotors/default.nix +++ b/distros/melodic/rqt-rotors/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The rqt_rotors package''; - license = with lib.licenses; [ asl20 ]; + license = with lib.licenses; [ "ASL-2.0" ]; }; } diff --git a/distros/melodic/rqt/default.nix b/distros/melodic/rqt/default.nix index c230b4e02f..954511efb9 100644 --- a/distros/melodic/rqt/default.nix +++ b/distros/melodic/rqt/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, rqt-gui, rqt-gui-cpp, rqt-gui-py }: buildRosPackage { pname = "ros-melodic-rqt"; - version = "0.5.2-r1"; + version = "0.5.3-r1"; src = fetchurl { - url = "https://github.com/ros-gbp/rqt-release/archive/release/melodic/rqt/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "e3335ef566d7c61b9a4e7ae8c6c4b1a9d8b1c6958c281b81a594d58abfbb36a7"; + url = "https://github.com/ros-gbp/rqt-release/archive/release/melodic/rqt/0.5.3-1.tar.gz"; + name = "0.5.3-1.tar.gz"; + sha256 = "cdb608104bcac2220bd050b0fb084d9322ce02b615b567f2c1de46f46c5e7547"; }; buildType = "catkin"; diff --git a/distros/melodic/rslidar-sdk/default.nix b/distros/melodic/rslidar-sdk/default.nix index e47e8bf0a0..54d73331b0 100644 --- a/distros/melodic/rslidar-sdk/default.nix +++ b/distros/melodic/rslidar-sdk/default.nix @@ -5,15 +5,15 @@ { lib, buildRosPackage, fetchurl, catkin, libpcap, libyamlcpp, pcl, pcl-conversions, pcl-ros, roscpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-melodic-rslidar-sdk"; - version = "1.3.0-r3"; + version = "1.3.2-r1"; src = fetchurl { - url = "https://github.com/nobleo/rslidar_sdk-release/archive/release/melodic/rslidar_sdk/1.3.0-3.tar.gz"; - name = "1.3.0-3.tar.gz"; - sha256 = "d8cd9cad1a9edfcc06d0c7ec8d02456f466eb384cd422d789833057f50d958ca"; + url = "https://github.com/nobleo/rslidar_sdk-release/archive/release/melodic/rslidar_sdk/1.3.2-1.tar.gz"; + name = "1.3.2-1.tar.gz"; + sha256 = "915a93b2bdead3e4c5dc6616578a1bfd17a6b9d860e80628b594b81a5fe92d8c"; }; - buildType = "ament_cmake"; + buildType = "catkin"; propagatedBuildInputs = [ libpcap libyamlcpp pcl pcl-conversions pcl-ros roscpp sensor-msgs std-msgs ]; nativeBuildInputs = [ catkin ]; diff --git a/distros/melodic/rviz/default.nix b/distros/melodic/rviz/default.nix index 75b2cf6955..587c9030e9 100644 --- a/distros/melodic/rviz/default.nix +++ b/distros/melodic/rviz/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''3D visualization tool for ROS.''; - license = with lib.licenses; [ bsdOriginal "CC-BY-SA-3.0" ]; + license = with lib.licenses; [ bsdOriginal "Creative-Commons" ]; }; } diff --git a/distros/melodic/scaled-joint-trajectory-controller/default.nix b/distros/melodic/scaled-joint-trajectory-controller/default.nix index cce8351816..5e4c564256 100644 --- a/distros/melodic/scaled-joint-trajectory-controller/default.nix +++ b/distros/melodic/scaled-joint-trajectory-controller/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Provides controllers that use the speed scaling interface.''; - license = with lib.licenses; [ asl20 bsdOriginal ]; + license = with lib.licenses; [ asl20 "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/scan-tools/default.nix b/distros/melodic/scan-tools/default.nix index dbc7ac6846..b24886f9de 100644 --- a/distros/melodic/scan-tools/default.nix +++ b/distros/melodic/scan-tools/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Laser scan processing tools.''; - license = with lib.licenses; [ bsdOriginal lgpl2 ]; + license = with lib.licenses; [ bsdOriginal "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/septentrio-gnss-driver/default.nix b/distros/melodic/septentrio-gnss-driver/default.nix index d43d161440..0638501f66 100644 --- a/distros/melodic/septentrio-gnss-driver/default.nix +++ b/distros/melodic/septentrio-gnss-driver/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''ROSaic: C++ driver for Septentrio's mosaic receivers and beyond''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause-License" ]; }; } diff --git a/distros/melodic/slam-karto/default.nix b/distros/melodic/slam-karto/default.nix index 52fa5f731e..f3459de4df 100644 --- a/distros/melodic/slam-karto/default.nix +++ b/distros/melodic/slam-karto/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''This package pulls in the Karto mapping library, and provides a ROS wrapper for using it.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/slam-toolbox-msgs/default.nix b/distros/melodic/slam-toolbox-msgs/default.nix index 547eb8208a..9bdb22d5c8 100644 --- a/distros/melodic/slam-toolbox-msgs/default.nix +++ b/distros/melodic/slam-toolbox-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package provides a sped up improved slam karto with updated SDK and visualization and modification toolsets''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/slam-toolbox/default.nix b/distros/melodic/slam-toolbox/default.nix index e729c8cc4e..bd92f89068 100644 --- a/distros/melodic/slam-toolbox/default.nix +++ b/distros/melodic/slam-toolbox/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''This package provides a sped up improved slam karto with updated SDK and visualization and modification toolsets''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/slic/default.nix b/distros/melodic/slic/default.nix index c9d2f302f1..0a97c6adc7 100644 --- a/distros/melodic/slic/default.nix +++ b/distros/melodic/slic/default.nix @@ -26,6 +26,6 @@ buildRosPackage { This implementation is created for the specific purpose of creating over-segmentations in an OpenCV-based environment.''; - license = with lib.licenses; [ "N/A" ]; + license = with lib.licenses; [ "N-A" ]; }; } diff --git a/distros/melodic/slime-ros/default.nix b/distros/melodic/slime-ros/default.nix index e0ec036496..948b8e45f8 100644 --- a/distros/melodic/slime-ros/default.nix +++ b/distros/melodic/slime-ros/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Extensions for slime to assist in working with ROS packages''; - license = with lib.licenses; [ publicDomain ]; + license = with lib.licenses; [ "PD" ]; }; } diff --git a/distros/melodic/slime-wrapper/default.nix b/distros/melodic/slime-wrapper/default.nix index 572e5a5445..3eec363e46 100644 --- a/distros/melodic/slime-wrapper/default.nix +++ b/distros/melodic/slime-wrapper/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ROS wrapper for slime''; - license = with lib.licenses; [ publicDomain ]; + license = with lib.licenses; [ "PD" ]; }; } diff --git a/distros/melodic/socketcan-interface/default.nix b/distros/melodic/socketcan-interface/default.nix index d332c0c3b5..6f9e1c2713 100644 --- a/distros/melodic/socketcan-interface/default.nix +++ b/distros/melodic/socketcan-interface/default.nix @@ -20,6 +20,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 = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/soem/default.nix b/distros/melodic/soem/default.nix index 1073f91112..f826648971 100644 --- a/distros/melodic/soem/default.nix +++ b/distros/melodic/soem/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''ROS wrapper for the Simple Open EtherCAT Master SOEM. This is an updated version of the original SOEM wrapper released into ROS now including the upstream Repo as a git subtree.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPLv2-with-linking-exception" ]; }; } diff --git a/distros/melodic/spatio-temporal-voxel-layer/default.nix b/distros/melodic/spatio-temporal-voxel-layer/default.nix index 9f96b11b61..aa5992682d 100644 --- a/distros/melodic/spatio-temporal-voxel-layer/default.nix +++ b/distros/melodic/spatio-temporal-voxel-layer/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The spatio-temporal 3D obstacle costmap package''; - license = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-only" ]; }; } diff --git a/distros/melodic/sr-hand-detector/default.nix b/distros/melodic/sr-hand-detector/default.nix index 470ecf3f8b..043fbbb089 100644 --- a/distros/melodic/sr-hand-detector/default.nix +++ b/distros/melodic/sr-hand-detector/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The sr_hand_detector package''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/stage/default.nix b/distros/melodic/stage/default.nix index 647de264a7..c203edad72 100644 --- a/distros/melodic/stage/default.nix +++ b/distros/melodic/stage/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Mobile robot simulator http://rtv.github.com/Stage''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/static-tf/default.nix b/distros/melodic/static-tf/default.nix index 6ea24ca058..a136c377bf 100644 --- a/distros/melodic/static-tf/default.nix +++ b/distros/melodic/static-tf/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The static_tf package''; - license = with lib.licenses; [ "TODO" ]; + license = with lib.licenses; [ "TODO-CATKIN-PACKAGE-LICENSE" ]; }; } diff --git a/distros/melodic/steering-functions/default.nix b/distros/melodic/steering-functions/default.nix index fd70bd6058..6e9bead619 100644 --- a/distros/melodic/steering-functions/default.nix +++ b/distros/melodic/steering-functions/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cmake-modules, costmap-2d, eigen, geometry-msgs, nav-msgs, roscpp, roslib, tf, visualization-msgs }: buildRosPackage { pname = "ros-melodic-steering-functions"; - version = "0.1.0-r1"; + version = "0.1.1-r1"; src = fetchurl { - url = "https://github.com/nobleo/steering_functions-release/archive/release/melodic/steering_functions/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "800bb9121a562af00f81e20262a34e5263d9f28e99bd91bd6af68a1203341d09"; + url = "https://github.com/nobleo/steering_functions-release/archive/release/melodic/steering_functions/0.1.1-1.tar.gz"; + name = "0.1.1-1.tar.gz"; + sha256 = "772db944a5ea71f75509a1facb08f315589bc2643dcc65261a3fc3465125c37c"; }; buildType = "catkin"; diff --git a/distros/melodic/talos-description-calibration/default.nix b/distros/melodic/talos-description-calibration/default.nix index 154d7669d8..0670409efa 100644 --- a/distros/melodic/talos-description-calibration/default.nix +++ b/distros/melodic/talos-description-calibration/default.nix @@ -19,6 +19,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 = with lib.licenses; [ "CC-BY-NC-ND-4.0" ]; + license = with lib.licenses; [ "CC-BY-NC-ND-3.0" ]; }; } diff --git a/distros/melodic/talos-description-inertial/default.nix b/distros/melodic/talos-description-inertial/default.nix index 5746935314..567a019f7c 100644 --- a/distros/melodic/talos-description-inertial/default.nix +++ b/distros/melodic/talos-description-inertial/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Inertial parameters of talos''; - license = with lib.licenses; [ "CC-BY-NC-ND-4.0" ]; + license = with lib.licenses; [ "CC-BY-NC-ND-3.0" ]; }; } diff --git a/distros/melodic/test-mavros/default.nix b/distros/melodic/test-mavros/default.nix index 3294a17600..72b13428a8 100644 --- a/distros/melodic/test-mavros/default.nix +++ b/distros/melodic/test-mavros/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Tests for MAVROS package''; - license = with lib.licenses; [ bsdOriginal gpl3 lgpl2 ]; + license = with lib.licenses; [ bsdOriginal "GPL-3.0-only" "LGPL-3.0-only" ]; }; } diff --git a/distros/melodic/toposens-bringup/default.nix b/distros/melodic/toposens-bringup/default.nix new file mode 100644 index 0000000000..3acfc3f491 --- /dev/null +++ b/distros/melodic/toposens-bringup/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, joint-state-publisher, robot-state-publisher, rqt-gui, rqt-reconfigure, rviz, socketcan-bridge, toposens-description, toposens-driver, toposens-echo-driver, toposens-markers, toposens-pointcloud, turtlebot3-bringup, turtlebot3-teleop, xacro }: +buildRosPackage { + pname = "ros-melodic-toposens-bringup"; + version = "2.3.2-r1"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/melodic/toposens_bringup/2.3.2-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "5d2ea47ec1ad889f9dcad5cc08742a0c03e4863eb9f5c2e7cc7ba9ad1a779bc4"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ joint-state-publisher robot-state-publisher rqt-gui rqt-reconfigure rviz socketcan-bridge toposens-description toposens-driver toposens-echo-driver toposens-markers toposens-pointcloud turtlebot3-bringup turtlebot3-teleop xacro ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Launch files for bringup and demos of toposens package.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/melodic/toposens-description/default.nix b/distros/melodic/toposens-description/default.nix new file mode 100644 index 0000000000..3a4b40ffe4 --- /dev/null +++ b/distros/melodic/toposens-description/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, joint-state-publisher, robot-state-publisher, rviz, urdf, xacro }: +buildRosPackage { + pname = "ros-melodic-toposens-description"; + version = "2.3.2-r1"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/melodic/toposens_description/2.3.2-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "e2330e3e02f3637502df82796debffec75eee3bdef768686b2d0c86ebe20b3b3"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ joint-state-publisher robot-state-publisher rviz urdf xacro ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''3D models of the sensor for visualization.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/melodic/toposens-driver/default.nix b/distros/melodic/toposens-driver/default.nix new file mode 100644 index 0000000000..dbe6a5e151 --- /dev/null +++ b/distros/melodic/toposens-driver/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, dynamic-reconfigure, message-runtime, roscpp, roslaunch, rostest, toposens-msgs }: +buildRosPackage { + pname = "ros-melodic-toposens-driver"; + version = "2.3.2-r1"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/melodic/toposens_driver/2.3.2-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "3588cc32f084af046094e50f7dbbe1f0afdc17eab68588b78707825985b1fabe"; + }; + + buildType = "catkin"; + checkInputs = [ roslaunch rostest ]; + propagatedBuildInputs = [ dynamic-reconfigure message-runtime roscpp toposens-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''ROS device driver for communication with TS sensors.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/melodic/toposens-echo-driver/default.nix b/distros/melodic/toposens-echo-driver/default.nix new file mode 100644 index 0000000000..0b4f1d5c86 --- /dev/null +++ b/distros/melodic/toposens-echo-driver/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, cmake-modules, dynamic-reconfigure, genmsg, message-generation, message-runtime, roscpp, std-msgs, tf, tf2-ros, toposens-msgs }: +buildRosPackage { + pname = "ros-melodic-toposens-echo-driver"; + version = "2.3.2-r1"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/melodic/toposens_echo_driver/2.3.2-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "c829200a04cb77adbf35ef93ea5ed5b435adb5fdf3f38e616fe14e0a83e53f78"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ cmake-modules dynamic-reconfigure genmsg message-generation message-runtime roscpp std-msgs tf tf2-ros toposens-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''ROS device driver for communication with TS ECHO sensors on a CAN bus''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/melodic/toposens-markers/default.nix b/distros/melodic/toposens-markers/default.nix new file mode 100644 index 0000000000..abb21804b8 --- /dev/null +++ b/distros/melodic/toposens-markers/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, dynamic-reconfigure, message-runtime, roscpp, roslaunch, rostest, rviz-visual-tools, tf2-geometry-msgs, toposens-description, toposens-driver, toposens-msgs }: +buildRosPackage { + pname = "ros-melodic-toposens-markers"; + version = "2.3.2-r1"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/melodic/toposens_markers/2.3.2-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "c23c00bf88b627b162c43e1ebbf7faab2327ace293d581e56bb3b788fbb3de39"; + }; + + buildType = "catkin"; + checkInputs = [ roslaunch rostest ]; + propagatedBuildInputs = [ dynamic-reconfigure message-runtime roscpp rviz-visual-tools tf2-geometry-msgs toposens-description toposens-driver toposens-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Rviz integration for TS sensor data.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/melodic/toposens-msgs/default.nix b/distros/melodic/toposens-msgs/default.nix new file mode 100644 index 0000000000..9e89d09d61 --- /dev/null +++ b/distros/melodic/toposens-msgs/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, std-msgs }: +buildRosPackage { + pname = "ros-melodic-toposens-msgs"; + version = "2.3.2-r1"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/melodic/toposens_msgs/2.3.2-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "300a936f7ab85a553d989f4ca2941b5bc47e178484e0d3493971ca469ed97b43"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ geometry-msgs message-generation message-runtime std-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''ROS message definitions for TS sensors.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/melodic/toposens-pointcloud/default.nix b/distros/melodic/toposens-pointcloud/default.nix new file mode 100644 index 0000000000..34e56786d1 --- /dev/null +++ b/distros/melodic/toposens-pointcloud/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-runtime, pcl-ros, roscpp, roslaunch, rostest, tf2, tf2-geometry-msgs, toposens-driver, toposens-msgs, visualization-msgs }: +buildRosPackage { + pname = "ros-melodic-toposens-pointcloud"; + version = "2.3.2-r1"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/melodic/toposens_pointcloud/2.3.2-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "51785eda7f4696d179a7946ccc91d83586eb97b978c9c1aa1ff9515daf913078"; + }; + + buildType = "catkin"; + checkInputs = [ roslaunch rostest ]; + propagatedBuildInputs = [ geometry-msgs message-runtime pcl-ros roscpp tf2 tf2-geometry-msgs toposens-driver toposens-msgs visualization-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''PCL integration for TS sensors mounted on Turtlebot3.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/melodic/toposens-sync/default.nix b/distros/melodic/toposens-sync/default.nix new file mode 100644 index 0000000000..679bf82aad --- /dev/null +++ b/distros/melodic/toposens-sync/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, code-coverage, message-runtime, roscpp, roslaunch, rostest, toposens-driver, toposens-msgs }: +buildRosPackage { + pname = "ros-melodic-toposens-sync"; + version = "2.3.2-r1"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/melodic/toposens_sync/2.3.2-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "b28718d21769dd488beb4148cbab87881264430d768f791e738e82be701fe7d9"; + }; + + buildType = "catkin"; + checkInputs = [ code-coverage roslaunch rostest ]; + propagatedBuildInputs = [ message-runtime roscpp toposens-driver toposens-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Operational sync of multiple TS sensors.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/melodic/toposens/default.nix b/distros/melodic/toposens/default.nix new file mode 100644 index 0000000000..1014ada05e --- /dev/null +++ b/distros/melodic/toposens/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, toposens-bringup, toposens-description, toposens-driver, toposens-echo-driver, toposens-markers, toposens-msgs, toposens-pointcloud, toposens-sync }: +buildRosPackage { + pname = "ros-melodic-toposens"; + version = "2.3.2-r1"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/melodic/toposens/2.3.2-1/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "0d2c0d277960c5bc1ee6e2d76d3e66ba535234781fba04662871a15fc2343082"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ toposens-bringup toposens-description toposens-driver toposens-echo-driver toposens-markers toposens-msgs toposens-pointcloud toposens-sync ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''ROS support for Toposens 3D Ultrasound sensors.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/melodic/trajectory-tracker-rviz-plugins/default.nix b/distros/melodic/trajectory-tracker-rviz-plugins/default.nix index 10b4eccda0..dff0961f44 100644 --- a/distros/melodic/trajectory-tracker-rviz-plugins/default.nix +++ b/distros/melodic/trajectory-tracker-rviz-plugins/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Rviz plugins for trajectory_tracker_msgs''; - license = with lib.licenses; [ bsdOriginal "CC-BY-SA-3.0" ]; + license = with lib.licenses; [ bsdOriginal "Creative-Commons" ]; }; } diff --git a/distros/melodic/uos-tools/default.nix b/distros/melodic/uos-tools/default.nix index b039a3a481..65ba717228 100644 --- a/distros/melodic/uos-tools/default.nix +++ b/distros/melodic/uos-tools/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Various helper utilities not associated with a particular stack''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-GPL" ]; }; } diff --git a/distros/melodic/ur-client-library/default.nix b/distros/melodic/ur-client-library/default.nix index 38b12b7858..093e0a50f6 100644 --- a/distros/melodic/ur-client-library/default.nix +++ b/distros/melodic/ur-client-library/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Standalone C++ library for accessing Universal Robots interfaces. This has been forked off the ur_robot_driver.''; - license = with lib.licenses; [ asl20 bsd2 "Zlib" mit ]; + license = with lib.licenses; [ asl20 "BSD-2-Clause" "Zlib" mit ]; }; } diff --git a/distros/melodic/ur-msgs/default.nix b/distros/melodic/ur-msgs/default.nix index 3b3e1194de..daab859bb9 100644 --- a/distros/melodic/ur-msgs/default.nix +++ b/distros/melodic/ur-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Message and service definitions for interacting with Universal Robots robot controllers.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/uvc-camera/default.nix b/distros/melodic/uvc-camera/default.nix index f568b8f682..ec4db67137 100644 --- a/distros/melodic/uvc-camera/default.nix +++ b/distros/melodic/uvc-camera/default.nix @@ -24,6 +24,6 @@ buildRosPackage { for stereo vision. Currently uses the base driver from Morgan Quigley's uvc_cam package.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/melodic/uwsim-bullet/default.nix b/distros/melodic/uwsim-bullet/default.nix index 0ba4bea3fb..1d3694acd8 100644 --- a/distros/melodic/uwsim-bullet/default.nix +++ b/distros/melodic/uwsim-bullet/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The bullet library. See https://code.google.com/p/bullet''; - license = with lib.licenses; [ "Check author's website" ]; + license = with lib.licenses; [ "Check-authors-website" ]; }; } diff --git a/distros/melodic/uwsim-osgbullet/default.nix b/distros/melodic/uwsim-osgbullet/default.nix index 17cac8b1a6..2173f6a219 100644 --- a/distros/melodic/uwsim-osgbullet/default.nix +++ b/distros/melodic/uwsim-osgbullet/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The OSG Bullet library adapted to UWSim. See https://code.google.com/p/osgbullet''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/uwsim-osgocean/default.nix b/distros/melodic/uwsim-osgocean/default.nix index 137aceac5d..5f0cf6f70f 100644 --- a/distros/melodic/uwsim-osgocean/default.nix +++ b/distros/melodic/uwsim-osgocean/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The OSG Ocean library adapted to UWSim. See https://code.google.com/p/osgocean''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/uwsim-osgworks/default.nix b/distros/melodic/uwsim-osgworks/default.nix index 6d09547b89..704802b058 100644 --- a/distros/melodic/uwsim-osgworks/default.nix +++ b/distros/melodic/uwsim-osgworks/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The OSG Works library adapted to UWSim. See https://code.google.com/p/osgworks''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/melodic/uwsim/default.nix b/distros/melodic/uwsim/default.nix index d2ef011576..47b8f4028d 100644 --- a/distros/melodic/uwsim/default.nix +++ b/distros/melodic/uwsim/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''UWSim is an UnderWater SIMulator for marine robotics research and development. UWSim visualizes an underwater virtual scenario that can be configured using standard modeling software. Controllable underwater vehicles, surface vessels and robotic manipulators, as well as simulated sensors, can be added to the scene and accessed externally through ROS interfaces. This allows to easily integrate the visualization tool with existing control architectures.''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/melodic/variant-msgs/default.nix b/distros/melodic/variant-msgs/default.nix index 1dc4e6a2b5..bd16c522db 100644 --- a/distros/melodic/variant-msgs/default.nix +++ b/distros/melodic/variant-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { 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 = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "GNU-Lesser-General-Public-License-LGPL-" ]; }; } diff --git a/distros/melodic/variant-topic-tools/default.nix b/distros/melodic/variant-topic-tools/default.nix index e7fd5f01fe..060825d0e2 100644 --- a/distros/melodic/variant-topic-tools/default.nix +++ b/distros/melodic/variant-topic-tools/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Topic tools for treating messages as variant types.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "GNU-Lesser-General-Public-License-LGPL-" ]; }; } diff --git a/distros/melodic/variant/default.nix b/distros/melodic/variant/default.nix index d96b66f314..1b396ea9b1 100644 --- a/distros/melodic/variant/default.nix +++ b/distros/melodic/variant/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Meta-package for the universal variant library.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "GNU-Lesser-General-Public-License-LGPL-" ]; }; } diff --git a/distros/melodic/vision-visp/default.nix b/distros/melodic/vision-visp/default.nix index 2eb1e67595..4e8d41e671 100644 --- a/distros/melodic/vision-visp/default.nix +++ b/distros/melodic/vision-visp/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Virtual package providing ViSP related packages.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/melodic/visp-auto-tracker/default.nix b/distros/melodic/visp-auto-tracker/default.nix index 4682a70231..438f2f0f84 100644 --- a/distros/melodic/visp-auto-tracker/default.nix +++ b/distros/melodic/visp-auto-tracker/default.nix @@ -30,6 +30,6 @@ buildRosPackage { This computer vision algorithm computes the pose (i.e. position and orientation) of an object in an image. It is fast enough to allow object online tracking using a camera.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/melodic/visp-bridge/default.nix b/distros/melodic/visp-bridge/default.nix index e365eea3dd..d44199a5bb 100644 --- a/distros/melodic/visp-bridge/default.nix +++ b/distros/melodic/visp-bridge/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Converts between ROS structures and ViSP structures.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/melodic/visp-camera-calibration/default.nix b/distros/melodic/visp-camera-calibration/default.nix index d5e4b69781..edc58c0367 100644 --- a/distros/melodic/visp-camera-calibration/default.nix +++ b/distros/melodic/visp-camera-calibration/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''visp_camera_calibration allows easy calibration of cameras using a customizable pattern and ViSP library.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/melodic/visp-hand2eye-calibration/default.nix b/distros/melodic/visp-hand2eye-calibration/default.nix index acc545df8e..027c725292 100644 --- a/distros/melodic/visp-hand2eye-calibration/default.nix +++ b/distros/melodic/visp-hand2eye-calibration/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''visp_hand2eye_calibration estimates the camera position with respect to its effector using the ViSP library.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/melodic/visp-tracker/default.nix b/distros/melodic/visp-tracker/default.nix index 10ee7ef61b..aa38eb8b48 100644 --- a/distros/melodic/visp-tracker/default.nix +++ b/distros/melodic/visp-tracker/default.nix @@ -24,6 +24,6 @@ buildRosPackage { This computer vision algorithm computes the pose (i.e. position and orientation) of an object in an image. It is fast enough to allow object online tracking using a camera.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/melodic/voice-text/default.nix b/distros/melodic/voice-text/default.nix index 561a43a300..bc71b52b55 100644 --- a/distros/melodic/voice-text/default.nix +++ b/distros/melodic/voice-text/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''voice_text (www.voicetext.jp)''; - license = with lib.licenses; [ "HOYA License" ]; + license = with lib.licenses; [ "HOYA-License" ]; }; } diff --git a/distros/melodic/volta-base/default.nix b/distros/melodic/volta-base/default.nix index dc4cb16bfb..a57e78cf67 100644 --- a/distros/melodic/volta-base/default.nix +++ b/distros/melodic/volta-base/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The volta_base package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/volta-control/default.nix b/distros/melodic/volta-control/default.nix index 3c552be569..6dac128ae5 100644 --- a/distros/melodic/volta-control/default.nix +++ b/distros/melodic/volta-control/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_control package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/volta-description/default.nix b/distros/melodic/volta-description/default.nix index eaa4f304c1..55bcbe598a 100644 --- a/distros/melodic/volta-description/default.nix +++ b/distros/melodic/volta-description/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_description package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/volta-localization/default.nix b/distros/melodic/volta-localization/default.nix index 90ecabdeda..9de4d4a1d3 100644 --- a/distros/melodic/volta-localization/default.nix +++ b/distros/melodic/volta-localization/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_localization package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/volta-msgs/default.nix b/distros/melodic/volta-msgs/default.nix index 7397187ab0..68e542d71c 100644 --- a/distros/melodic/volta-msgs/default.nix +++ b/distros/melodic/volta-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_msgs package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/volta-navigation/default.nix b/distros/melodic/volta-navigation/default.nix index af1d94cb62..aa1e27befa 100644 --- a/distros/melodic/volta-navigation/default.nix +++ b/distros/melodic/volta-navigation/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_navigation package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/volta-rules/default.nix b/distros/melodic/volta-rules/default.nix index 3db6297b26..6ebba75507 100644 --- a/distros/melodic/volta-rules/default.nix +++ b/distros/melodic/volta-rules/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The volta_rules package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/volta-simulation/default.nix b/distros/melodic/volta-simulation/default.nix index f05bfae5e7..df0430e739 100644 --- a/distros/melodic/volta-simulation/default.nix +++ b/distros/melodic/volta-simulation/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The volta_simulation package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/volta-teleoperator/default.nix b/distros/melodic/volta-teleoperator/default.nix index af50ba8489..fa9d970938 100644 --- a/distros/melodic/volta-teleoperator/default.nix +++ b/distros/melodic/volta-teleoperator/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_teleoperator package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/melodic/vrpn/default.nix b/distros/melodic/vrpn/default.nix index 60edbfec36..793bedc62c 100644 --- a/distros/melodic/vrpn/default.nix +++ b/distros/melodic/vrpn/default.nix @@ -19,6 +19,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 = with lib.licenses; [ "BSL1.0" ]; + license = with lib.licenses; [ "BSL-1.0" ]; }; } diff --git a/distros/melodic/wge100-camera/default.nix b/distros/melodic/wge100-camera/default.nix index 6a85eb84c5..19b11cc6dc 100644 --- a/distros/melodic/wge100-camera/default.nix +++ b/distros/melodic/wge100-camera/default.nix @@ -22,6 +22,6 @@ buildRosPackage { 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 ]; + license = with lib.licenses; [ "GPL-because-of-list.h-&-other-files-released-under-BSD" ]; }; } diff --git a/distros/melodic/wge100-driver/default.nix b/distros/melodic/wge100-driver/default.nix index 58125f13fc..c0db29dca3 100644 --- a/distros/melodic/wge100-driver/default.nix +++ b/distros/melodic/wge100-driver/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This stack contains the ROS driver and firmware for the WGE100 camera used on the PR2 robot.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-GPL-because-of-list.h-&-other-files-released-under-BSD-&-GPL" ]; }; } diff --git a/distros/melodic/xmlrpcpp/default.nix b/distros/melodic/xmlrpcpp/default.nix index 9d86fe64a9..6b1999c9f2 100644 --- a/distros/melodic/xmlrpcpp/default.nix +++ b/distros/melodic/xmlrpcpp/default.nix @@ -23,6 +23,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 = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-only" ]; }; } diff --git a/distros/melodic/yocs-navi-toolkit/default.nix b/distros/melodic/yocs-navi-toolkit/default.nix index c73f5ae6b1..f911e6d13a 100644 --- a/distros/melodic/yocs-navi-toolkit/default.nix +++ b/distros/melodic/yocs-navi-toolkit/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Ros navigation utilities.''; - license = with lib.licenses; [ "Yujin Robot" ]; + license = with lib.licenses; [ "Yujin-Robot" ]; }; } diff --git a/distros/noetic/abb-egm-msgs/default.nix b/distros/noetic/abb-egm-msgs/default.nix index e9a24db417..34ab1540df 100644 --- a/distros/noetic/abb-egm-msgs/default.nix +++ b/distros/noetic/abb-egm-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Provides ROS message definitions, representing Externally Guided Motion (EGM) data from ABB robot controllers.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/abb-rapid-msgs/default.nix b/distros/noetic/abb-rapid-msgs/default.nix index 611e22b078..c590857721 100644 --- a/distros/noetic/abb-rapid-msgs/default.nix +++ b/distros/noetic/abb-rapid-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Provides ROS message definitions, representing RAPID data from ABB robot controllers.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/abb-rapid-sm-addin-msgs/default.nix b/distros/noetic/abb-rapid-sm-addin-msgs/default.nix index b792939472..e923d4300f 100644 --- a/distros/noetic/abb-rapid-sm-addin-msgs/default.nix +++ b/distros/noetic/abb-rapid-sm-addin-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Provides ROS message and service definitions, representing interaction with ABB robot controllers using the RobotWare StateMachine Add-In.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/abb-robot-msgs/default.nix b/distros/noetic/abb-robot-msgs/default.nix index 6dc9d4fb5c..3c48148a83 100644 --- a/distros/noetic/abb-robot-msgs/default.nix +++ b/distros/noetic/abb-robot-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Provides ROS message and service definitions, representing basic interaction with ABB robot controllers.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/amcl/default.nix b/distros/noetic/amcl/default.nix index d32577f90e..2880da66bd 100644 --- a/distros/noetic/amcl/default.nix +++ b/distros/noetic/amcl/default.nix @@ -30,6 +30,6 @@ buildRosPackage { This node is derived, with thanks, from Andrew Howard's excellent 'amcl' Player driver.

''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/apriltag-ros/default.nix b/distros/noetic/apriltag-ros/default.nix index 422a1d6f69..c502790d01 100644 --- a/distros/noetic/apriltag-ros/default.nix +++ b/distros/noetic/apriltag-ros/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, apriltag, catkin, cmake-modules, cv-bridge, eigen, geometry-msgs, image-geometry, image-transport, message-generation, message-runtime, nodelet, opencv3, pluginlib, roscpp, sensor-msgs, std-msgs, tf }: buildRosPackage { pname = "ros-noetic-apriltag-ros"; - version = "3.1.2-r1"; + version = "3.2.0-r1"; src = fetchurl { - url = "https://github.com/AprilRobotics/apriltag_ros-release/archive/release/noetic/apriltag_ros/3.1.2-1.tar.gz"; - name = "3.1.2-1.tar.gz"; - sha256 = "303875c5224713f03cba55605b0d5110fbce4325ecce284505aa825ea8224537"; + url = "https://github.com/AprilRobotics/apriltag_ros-release/archive/release/noetic/apriltag_ros/3.2.0-1.tar.gz"; + name = "3.2.0-1.tar.gz"; + sha256 = "2e7f1a6a2c72ad6563abb377f77f977af9c3dddfaad9214c45f47e95a11ec8a4"; }; buildType = "catkin"; diff --git a/distros/noetic/apriltag/default.nix b/distros/noetic/apriltag/default.nix index b18ce3541f..aea17548ba 100644 --- a/distros/noetic/apriltag/default.nix +++ b/distros/noetic/apriltag/default.nix @@ -2,19 +2,20 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, cmake, python3Packages }: +{ lib, buildRosPackage, fetchurl, cmake, opencv3, python3Packages }: buildRosPackage { pname = "ros-noetic-apriltag"; - version = "3.1.6-r1"; + version = "3.2.0-r1"; src = fetchurl { - url = "https://github.com/AprilRobotics/apriltag-release/archive/release/noetic/apriltag/3.1.6-1.tar.gz"; - name = "3.1.6-1.tar.gz"; - sha256 = "5e1ab4f3dc574ade6e959333fbbb58f5122cf3a4e6a7f450090ef82f77dea27a"; + url = "https://github.com/AprilRobotics/apriltag-release/archive/release/noetic/apriltag/3.2.0-1.tar.gz"; + name = "3.2.0-1.tar.gz"; + sha256 = "aa4d2209785b7a6a2acdd86d1939d886efd3a7ddbc5401d1e0d4f67de6a4ac45"; }; buildType = "cmake"; buildInputs = [ python3Packages.numpy ]; + checkInputs = [ opencv3 ]; nativeBuildInputs = [ cmake ]; meta = { diff --git a/distros/noetic/assimp-devel/default.nix b/distros/noetic/assimp-devel/default.nix index 99bf602545..4cf02ee8eb 100644 --- a/distros/noetic/assimp-devel/default.nix +++ b/distros/noetic/assimp-devel/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''assimp library''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/baldor/default.nix b/distros/noetic/baldor/default.nix index 01f09a1f8e..add14535b1 100644 --- a/distros/noetic/baldor/default.nix +++ b/distros/noetic/baldor/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The baldor package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/bota-driver-testing/default.nix b/distros/noetic/bota-driver-testing/default.nix index a40f129935..ea8ccd9e7e 100644 --- a/distros/noetic/bota-driver-testing/default.nix +++ b/distros/noetic/bota-driver-testing/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r2"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/bota_driver_testing/0.6.1-2/bota_driver-release-release-noetic-bota_driver_testing-0.6.1-2.tar.gz"; - name = "bota_driver-release-release-noetic-bota_driver_testing-0.6.1-2.tar.gz"; - sha256 = "1b24dff517d15502be681786d9080ef32b006f8f7a4bd7e9a577e5f041b27430"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/bota_driver_testing/0.6.1-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "c1a448ea4a778515d533464276bcbe951f5dc6a2e9a46874ca83deb1bf5504da"; }; buildType = "catkin"; diff --git a/distros/noetic/bota-driver/default.nix b/distros/noetic/bota-driver/default.nix index 4eb8f3d9a6..008c91cbc9 100644 --- a/distros/noetic/bota-driver/default.nix +++ b/distros/noetic/bota-driver/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r2"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/bota_driver/0.6.1-2/bota_driver-release-release-noetic-bota_driver-0.6.1-2.tar.gz"; - name = "bota_driver-release-release-noetic-bota_driver-0.6.1-2.tar.gz"; - sha256 = "fc37fb62eaab0862d7c694feb2988a5a53dce33354bf03eee68693e9606d9fab"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/bota_driver/0.6.1-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "3ad717b404a84c5cd0c01d37cde02156110a4f579e1eb5f9d8dc491bf85e551c"; }; buildType = "catkin"; diff --git a/distros/noetic/bota-node/default.nix b/distros/noetic/bota-node/default.nix index d9ca8d4242..6dea885773 100644 --- a/distros/noetic/bota-node/default.nix +++ b/distros/noetic/bota-node/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r2"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/bota_node/0.6.1-2/bota_driver-release-release-noetic-bota_node-0.6.1-2.tar.gz"; - name = "bota_driver-release-release-noetic-bota_node-0.6.1-2.tar.gz"; - sha256 = "3972167a99dec308b955c57ab11a0a8c93dcecf4405a5cad982ee098bf0d254a"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/bota_node/0.6.1-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "6bc5c8ffa4fb73553588838abac77348f29308fd241bac196cda5f57d4560acb"; }; buildType = "catkin"; diff --git a/distros/noetic/bota-signal-handler/default.nix b/distros/noetic/bota-signal-handler/default.nix index a0ef67842b..fbcb1f7052 100644 --- a/distros/noetic/bota-signal-handler/default.nix +++ b/distros/noetic/bota-signal-handler/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r2"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/bota_signal_handler/0.6.1-2/bota_driver-release-release-noetic-bota_signal_handler-0.6.1-2.tar.gz"; - name = "bota_driver-release-release-noetic-bota_signal_handler-0.6.1-2.tar.gz"; - sha256 = "703a2887c917d76e463aa11b76d2079e7821da7f59b43b0d5002442a4d236036"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/bota_signal_handler/0.6.1-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "bed277c9b97f13f4616253b489ad3f4c1a02e96134f5fee8b4cf5b3353777901"; }; buildType = "catkin"; diff --git a/distros/noetic/bota-worker/default.nix b/distros/noetic/bota-worker/default.nix index 9103055f29..f7f90ffa71 100644 --- a/distros/noetic/bota-worker/default.nix +++ b/distros/noetic/bota-worker/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r2"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/bota_worker/0.6.1-2/bota_driver-release-release-noetic-bota_worker-0.6.1-2.tar.gz"; - name = "bota_driver-release-release-noetic-bota_worker-0.6.1-2.tar.gz"; - sha256 = "6d8b25afa5ccb58f705ff0cc1a8e19ad2998442a21f94b382fd8013b4b3377cf"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/bota_worker/0.6.1-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "bb8b0e85ed5889c3f29361ba0136ea0314df052dc23c9ca5fad7999cf01dff03"; }; buildType = "catkin"; diff --git a/distros/noetic/camera-aravis/default.nix b/distros/noetic/camera-aravis/default.nix index aa8bc287ab..817f6e7b05 100644 --- a/distros/noetic/camera-aravis/default.nix +++ b/distros/noetic/camera-aravis/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, aravis, camera-info-manager, catkin, dynamic-reconfigure, glib, image-transport, message-generation, message-runtime, nodelet, roscpp, sensor-msgs, std-msgs, tf, tf2-ros }: buildRosPackage { pname = "ros-noetic-camera-aravis"; - version = "4.0.0-r1"; + version = "4.0.1-r2"; src = fetchurl { - url = "https://github.com/FraunhoferIOSB/camera_aravis-release/archive/release/noetic/camera_aravis/4.0.0-1.tar.gz"; - name = "4.0.0-1.tar.gz"; - sha256 = "18d356bb4c429a1361c85b14b41de397a1dd2b56d975cb2c643cafb54c50db5a"; + url = "https://github.com/FraunhoferIOSB/camera_aravis-release/archive/release/noetic/camera_aravis/4.0.1-2.tar.gz"; + name = "4.0.1-2.tar.gz"; + sha256 = "7b521ceb0d18a3751afaa1ed5831ab10053c8f512bbbc47a6baa4d9ca7dc60ac"; }; buildType = "catkin"; @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''camera_aravis: A complete and comfortable GenICam (USB3Vision and GigEVision) based camera driver for ROS (ethernet and usb).''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-2.0-only" ]; }; } diff --git a/distros/noetic/canopen-402/default.nix b/distros/noetic/canopen-402/default.nix index 5c58e5c72b..17c8464029 100644 --- a/distros/noetic/canopen-402/default.nix +++ b/distros/noetic/canopen-402/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This implements the CANopen device profile for drives and motion control. CiA(r) 402''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/canopen-chain-node/default.nix b/distros/noetic/canopen-chain-node/default.nix index 40da810e40..f3c7960bf1 100644 --- a/distros/noetic/canopen-chain-node/default.nix +++ b/distros/noetic/canopen-chain-node/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Base implementation for CANopen chains node with support for management services and diagnostics''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/canopen-master/default.nix b/distros/noetic/canopen-master/default.nix index e7a0e12858..61e31492ec 100644 --- a/distros/noetic/canopen-master/default.nix +++ b/distros/noetic/canopen-master/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''CiA(r) CANopen 301 master implementation with support for interprocess master synchronisation.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/canopen-motor-node/default.nix b/distros/noetic/canopen-motor-node/default.nix index 6acf7f4257..9b26f45c3d 100644 --- a/distros/noetic/canopen-motor-node/default.nix +++ b/distros/noetic/canopen-motor-node/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''canopen_chain_node specialization for handling of canopen_402 motor devices. It facilitates interface abstraction with ros_control.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/catkin-virtualenv/default.nix b/distros/noetic/catkin-virtualenv/default.nix index 358f9c1f66..20038ec2e9 100644 --- a/distros/noetic/catkin-virtualenv/default.nix +++ b/distros/noetic/catkin-virtualenv/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Bundle python requirements in a catkin package via virtualenv.''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/cmvision/default.nix b/distros/noetic/cmvision/default.nix index 168edb0e3d..14bc2508a0 100644 --- a/distros/noetic/cmvision/default.nix +++ b/distros/noetic/cmvision/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Node for the Color Machine Vision Project, used for fast color blob detection''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/cob-base-drive-chain/default.nix b/distros/noetic/cob-base-drive-chain/default.nix index 1dd965c4de..649a4e9c87 100644 --- a/distros/noetic/cob-base-drive-chain/default.nix +++ b/distros/noetic/cob-base-drive-chain/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-canopen-motor, cob-generic-can, cob-utilities, control-msgs, diagnostic-msgs, message-generation, message-runtime, roscpp, sensor-msgs, std-msgs, std-srvs }: buildRosPackage { pname = "ros-noetic-cob-base-drive-chain"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_base_drive_chain/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "5806117f4b96918ec385aa93a5e0b132c3d48772b1538d9acf94ec6c15cb11dc"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_base_drive_chain/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "e37fea92c6147baeefd85572c5ce77dfbf4ff9bf63ece189c0ec3c991758f1e5"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-bms-driver/default.nix b/distros/noetic/cob-bms-driver/default.nix index 7a9671c69b..7458854f3b 100644 --- a/distros/noetic/cob-bms-driver/default.nix +++ b/distros/noetic/cob-bms-driver/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-msgs, cob-srvs, diagnostic-msgs, diagnostic-updater, python3Packages, roscpp, rospy, socketcan-interface, std-msgs }: buildRosPackage { pname = "ros-noetic-cob-bms-driver"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_bms_driver/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "bf064a4a8de97141d4004ed9ca9e7493fe04f9a04140e608d2a29e1cec42b874"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_bms_driver/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "3a320f76d580a236ce06577a1df7b20ef79fa0f19b1c0911119aa8efd6dc691e"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-canopen-motor/default.nix b/distros/noetic/cob-canopen-motor/default.nix index 77fe33468e..e3904edaae 100644 --- a/distros/noetic/cob-canopen-motor/default.nix +++ b/distros/noetic/cob-canopen-motor/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-generic-can, cob-utilities, roscpp }: buildRosPackage { pname = "ros-noetic-cob-canopen-motor"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_canopen_motor/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "741aa4bdf1f8a6362691ef06a77422f3cc7b327385bec855879ad6800388da4b"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_canopen_motor/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "0c2bedf468849a49ccd6bdb63b0a1bc2e09326ecd48171aa108c80e626116475"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-command-gui/default.nix b/distros/noetic/cob-command-gui/default.nix index 5de09ba219..d11b08d45b 100644 --- a/distros/noetic/cob-command-gui/default.nix +++ b/distros/noetic/cob-command-gui/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-msgs, cob-script-server, python3Packages, roslib, rospy }: buildRosPackage { pname = "ros-noetic-cob-command-gui"; - version = "0.6.27-r1"; + version = "0.6.28-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_command_gui/0.6.27-1.tar.gz"; - name = "0.6.27-1.tar.gz"; - sha256 = "5d980bb9e7d9705a200d8fd8776fdcc5b11a7155163f41e70e5854d495d01fdc"; + url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_command_gui/0.6.28-1.tar.gz"; + name = "0.6.28-1.tar.gz"; + sha256 = "c349c9543b1f66316c4d13657225b1e47f66a3e188529e39ee4d0453911b4f45"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-command-tools/default.nix b/distros/noetic/cob-command-tools/default.nix index 4ebaed3e2b..76d4008256 100644 --- a/distros/noetic/cob-command-tools/default.nix +++ b/distros/noetic/cob-command-tools/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-command-gui, cob-dashboard, cob-helper-tools, cob-interactive-teleop, cob-monitoring, cob-script-server, cob-teleop }: buildRosPackage { pname = "ros-noetic-cob-command-tools"; - version = "0.6.27-r1"; + version = "0.6.28-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_command_tools/0.6.27-1.tar.gz"; - name = "0.6.27-1.tar.gz"; - sha256 = "22088b799e92e43e54a25eeebc0cb200b1a8b549e2a3ee7b58cbe8629ed26652"; + url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_command_tools/0.6.28-1.tar.gz"; + name = "0.6.28-1.tar.gz"; + sha256 = "de67fa56a27a0ee296a68bdedea01ec5fa789d607b0d863a97f3126521647c6a"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-dashboard/default.nix b/distros/noetic/cob-dashboard/default.nix index a997e8b65f..07cb0ad09c 100644 --- a/distros/noetic/cob-dashboard/default.nix +++ b/distros/noetic/cob-dashboard/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-msgs, python3Packages, roslib, rospy, rqt-gui, rqt-robot-dashboard }: buildRosPackage { pname = "ros-noetic-cob-dashboard"; - version = "0.6.27-r1"; + version = "0.6.28-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_dashboard/0.6.27-1.tar.gz"; - name = "0.6.27-1.tar.gz"; - sha256 = "ca2f1295f3daec7542e5c98229c0e5372ebab29e75c7aa0439e641bd384fa544"; + url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_dashboard/0.6.28-1.tar.gz"; + name = "0.6.28-1.tar.gz"; + sha256 = "e983c504aa63fef672e0968cd066a8c02fc09832ba6278ee76a9395485f8669f"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-driver/default.nix b/distros/noetic/cob-driver/default.nix index 18fcbecca7..d5c977dc15 100644 --- a/distros/noetic/cob-driver/default.nix +++ b/distros/noetic/cob-driver/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-base-drive-chain, cob-bms-driver, cob-canopen-motor, cob-elmo-homing, cob-generic-can, cob-light, cob-mimic, cob-phidgets, cob-relayboard, cob-scan-unifier, cob-sick-lms1xx, cob-sick-s300, cob-sound, cob-undercarriage-ctrl, cob-utilities, cob-voltage-control }: buildRosPackage { pname = "ros-noetic-cob-driver"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_driver/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "b75854778d49027b164eea5dcbebc2053d6e1f8bc7db60a2a0dfbd411dc7cc86"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_driver/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "ce40aa8995aa3141142921c703ef1e3fc796ab5eb1a10f8f4c8d82d2e33cd7f6"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-elmo-homing/default.nix b/distros/noetic/cob-elmo-homing/default.nix index 3d40791c12..7aa3931d90 100644 --- a/distros/noetic/cob-elmo-homing/default.nix +++ b/distros/noetic/cob-elmo-homing/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, canopen-402, catkin, pluginlib, socketcan-interface }: buildRosPackage { pname = "ros-noetic-cob-elmo-homing"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_elmo_homing/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "5d249b73bd8307623db3e0eab9915d66c61267695deb5e58023fcfa7e29592dc"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_elmo_homing/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "8a405af15992138b050df31bea236ad5ee25ed5d559e035d3c36a186b1f0f95a"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-extern/default.nix b/distros/noetic/cob-extern/default.nix index c11561c01a..bff70c7ea5 100644 --- a/distros/noetic/cob-extern/default.nix +++ b/distros/noetic/cob-extern/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The cob_extern stack contains third party libraries needed for operating Care-O-bot. The packages are downloaded from the manufactorers website and not changed in any way.''; - license = with lib.licenses; [ lgpl2 "proprietary" ]; + license = with lib.licenses; [ "LGPL" "Proprietary" ]; }; } diff --git a/distros/noetic/cob-generic-can/default.nix b/distros/noetic/cob-generic-can/default.nix index c024d719de..4ad6d422f7 100644 --- a/distros/noetic/cob-generic-can/default.nix +++ b/distros/noetic/cob-generic-can/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-utilities, libntcan, libpcan, socketcan-interface }: buildRosPackage { pname = "ros-noetic-cob-generic-can"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_generic_can/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "287ee2ad6ea34e04f1191ac4ee4199ad3baa7696fcdf92d198bd8179ab83a563"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_generic_can/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "2b73d86994723020f160a2e08094299bfe0cf11edf50574b879c21da66a1e6b4"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-helper-tools/default.nix b/distros/noetic/cob-helper-tools/default.nix index cac026b736..75fa16554e 100644 --- a/distros/noetic/cob-helper-tools/default.nix +++ b/distros/noetic/cob-helper-tools/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-msgs, cob-script-server, diagnostic-msgs, dynamic-reconfigure, message-generation, message-runtime, python3Packages, rospy, std-srvs, tf, visualization-msgs }: buildRosPackage { pname = "ros-noetic-cob-helper-tools"; - version = "0.6.27-r1"; + version = "0.6.28-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_helper_tools/0.6.27-1.tar.gz"; - name = "0.6.27-1.tar.gz"; - sha256 = "f9b47ea1e5a6bca981b436d18d6c65fad5d8eb71d4e3eafc1c4ba1f841ee08ad"; + url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_helper_tools/0.6.28-1.tar.gz"; + name = "0.6.28-1.tar.gz"; + sha256 = "d55444a29d13c290027f931cd468b5a1e3089f225818fa6c47423f8b19890c4f"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-interactive-teleop/default.nix b/distros/noetic/cob-interactive-teleop/default.nix index dbb992b6e8..aff630d41e 100644 --- a/distros/noetic/cob-interactive-teleop/default.nix +++ b/distros/noetic/cob-interactive-teleop/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, interactive-markers, roscpp, rviz, std-msgs, tf, visualization-msgs }: buildRosPackage { pname = "ros-noetic-cob-interactive-teleop"; - version = "0.6.27-r1"; + version = "0.6.28-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_interactive_teleop/0.6.27-1.tar.gz"; - name = "0.6.27-1.tar.gz"; - sha256 = "ab80181672935319300567b9d5552860ce4dee4f2fbcd9a5b1b38c79ef769435"; + url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_interactive_teleop/0.6.28-1.tar.gz"; + name = "0.6.28-1.tar.gz"; + sha256 = "7fe8effaabdd68e5318f486f75e992cecb44b8c1ad04df2d4746783f551a6514"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-light/default.nix b/distros/noetic/cob-light/default.nix index 264e8145e7..24d4d35797 100644 --- a/distros/noetic/cob-light/default.nix +++ b/distros/noetic/cob-light/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, actionlib, actionlib-msgs, boost, catkin, diagnostic-msgs, message-generation, message-runtime, roscpp, rospy, sensor-msgs, std-msgs, visualization-msgs }: buildRosPackage { pname = "ros-noetic-cob-light"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_light/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "cf60a5f96f24dc320be1f1ceeeec15d70c980f9c89e1df2517a3a2aa477628c4"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_light/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "954f88b2c70e4d635491bcc7bbf034d4764a3b5d6d22747f95be4b964a50ec0c"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-mimic/default.nix b/distros/noetic/cob-mimic/default.nix index 192d2a2642..0667360625 100644 --- a/distros/noetic/cob-mimic/default.nix +++ b/distros/noetic/cob-mimic/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, actionlib, actionlib-msgs, boost, catkin, diagnostic-msgs, diagnostic-updater, message-generation, message-runtime, roscpp, roslib, rospy, vlc }: buildRosPackage { pname = "ros-noetic-cob-mimic"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_mimic/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "c83ed33cd238190508db5dd407782d03d637ff0d1d1794e938d01409563c0327"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_mimic/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "bf582da8f64999af038380d0eed98ddd80ff5c35dc42af07cf6162bfe76a34c0"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-monitoring/default.nix b/distros/noetic/cob-monitoring/default.nix index 59ef8a8547..12ce3634b3 100644 --- a/distros/noetic/cob-monitoring/default.nix +++ b/distros/noetic/cob-monitoring/default.nix @@ -5,17 +5,17 @@ { lib, buildRosPackage, fetchurl, actionlib, catkin, cob-light, cob-msgs, cob-script-server, diagnostic-msgs, diagnostic-updater, ifstat-legacy, ipmitool, ntp, python3Packages, roscpp, rospy, rostopic, sensor-msgs, std-msgs, sysstat, topic-tools }: buildRosPackage { pname = "ros-noetic-cob-monitoring"; - version = "0.6.27-r1"; + version = "0.6.28-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_monitoring/0.6.27-1.tar.gz"; - name = "0.6.27-1.tar.gz"; - sha256 = "916ec5d5c53e4b34e52a2980483caa5b873d686fc750c450fb221bb0a64ed2ca"; + url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_monitoring/0.6.28-1.tar.gz"; + name = "0.6.28-1.tar.gz"; + sha256 = "becc61990ebb04602238bcbedc341cdbd0528b8c6a6f00beee6543d806cd6121"; }; buildType = "catkin"; propagatedBuildInputs = [ actionlib cob-light cob-msgs cob-script-server diagnostic-msgs diagnostic-updater ifstat-legacy ipmitool ntp python3Packages.paramiko python3Packages.psutil python3Packages.requests roscpp rospy rostopic sensor-msgs std-msgs sysstat topic-tools ]; - nativeBuildInputs = [ catkin ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''cob_monitoring''; diff --git a/distros/noetic/cob-phidget-em-state/default.nix b/distros/noetic/cob-phidget-em-state/default.nix index aa5568eb7e..1530ee4afb 100644 --- a/distros/noetic/cob-phidget-em-state/default.nix +++ b/distros/noetic/cob-phidget-em-state/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-msgs, cob-phidgets, rospy }: buildRosPackage { pname = "ros-noetic-cob-phidget-em-state"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_phidget_em_state/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "43929941ca3ccc40f2e2502d427b6db6e1aba8007097560e302686939e555da3"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_phidget_em_state/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "a9b9bffec2e0c8aae911378e859b94e0e5a3884c3ad27ec206fd7b0e7e971031"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-phidget-power-state/default.nix b/distros/noetic/cob-phidget-power-state/default.nix index b04b23c56a..74d1e5b893 100644 --- a/distros/noetic/cob-phidget-power-state/default.nix +++ b/distros/noetic/cob-phidget-power-state/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-msgs, cob-phidgets, rospy }: buildRosPackage { pname = "ros-noetic-cob-phidget-power-state"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_phidget_power_state/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "92aa231fcda9d7af8d5b80759511ae7fc27102245ff35c400c531682ad1123f6"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_phidget_power_state/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "17a971678bd07f4861f9e73c81570346058a5f60d63b39202351fe793b512ded"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-phidgets/default.nix b/distros/noetic/cob-phidgets/default.nix index 96b5f8c2cc..dd153068a7 100644 --- a/distros/noetic/cob-phidgets/default.nix +++ b/distros/noetic/cob-phidgets/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, libphidgets, message-generation, message-runtime, roscpp, rospy, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-noetic-cob-phidgets"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_phidgets/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "0c7c881c1bf1fad1e97d015e2c70b1b8104ada7cbe317ef820b4faacab5f4704"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_phidgets/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "9b5f9e9e5b9c812257fd171e5e8c901f34eeb4530c2a98bf328037ca9a0b530f"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-relayboard/default.nix b/distros/noetic/cob-relayboard/default.nix index 80e739182d..5a8aec691a 100644 --- a/distros/noetic/cob-relayboard/default.nix +++ b/distros/noetic/cob-relayboard/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-msgs, roscpp, rospy, std-msgs }: buildRosPackage { pname = "ros-noetic-cob-relayboard"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_relayboard/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "d12290c155c91e08399222638cd2a48b6cd9db4d8f00b9ca9245b523f2f8348d"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_relayboard/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "9590bbd1bc74f6d9138aa0d0e29c2f31f8e05587b77c6ddac21a7ee3e9f3a032"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-scan-unifier/default.nix b/distros/noetic/cob-scan-unifier/default.nix index 2ed2e6d9bf..efe727c887 100644 --- a/distros/noetic/cob-scan-unifier/default.nix +++ b/distros/noetic/cob-scan-unifier/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, laser-geometry, roscpp, sensor-msgs, tf }: buildRosPackage { pname = "ros-noetic-cob-scan-unifier"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_scan_unifier/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "e3ef09b3f86a4ba7afa8fdc962e38b426a5762a5cf8c1b18d763517f598dc51b"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_scan_unifier/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "50f997ad8177f29546d531461923f86344d024f97526168cc46ae7f189dbdc54"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-script-server/default.nix b/distros/noetic/cob-script-server/default.nix index 6e2d7f68d9..c95b7e0387 100644 --- a/distros/noetic/cob-script-server/default.nix +++ b/distros/noetic/cob-script-server/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, actionlib, actionlib-msgs, catkin, cob-actions, cob-light, cob-mimic, cob-sound, control-msgs, geometry-msgs, message-generation, message-runtime, move-base-msgs, python3Packages, rospy, rostest, std-msgs, std-srvs, tf, trajectory-msgs, urdfdom-py }: buildRosPackage { pname = "ros-noetic-cob-script-server"; - version = "0.6.27-r1"; + version = "0.6.28-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_script_server/0.6.27-1.tar.gz"; - name = "0.6.27-1.tar.gz"; - sha256 = "2fc5cf7263849b9624b997c80c203cd543125b502881e7089bb32af22105e0a2"; + url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_script_server/0.6.28-1.tar.gz"; + name = "0.6.28-1.tar.gz"; + sha256 = "1143ba075358fb31c5792ca553dd31ae5b8f033da31ced72af42b23ce0105920"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-sick-lms1xx/default.nix b/distros/noetic/cob-sick-lms1xx/default.nix index 1c5e35c21b..f4b7b6b20e 100644 --- a/distros/noetic/cob-sick-lms1xx/default.nix +++ b/distros/noetic/cob-sick-lms1xx/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, boost, catkin, diagnostic-msgs, roscpp, sensor-msgs }: buildRosPackage { pname = "ros-noetic-cob-sick-lms1xx"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_sick_lms1xx/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "62351b707f222f4fbff516f877b71941f4ba19f0516b8de6aa47e7b5fb3478c3"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_sick_lms1xx/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "6ae3458ea6b81f42df2846935d28faf2d9706fa188720258575a04f1a5aee92e"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-sick-s300/default.nix b/distros/noetic/cob-sick-s300/default.nix index 175a3b3069..56e6f86ff4 100644 --- a/distros/noetic/cob-sick-s300/default.nix +++ b/distros/noetic/cob-sick-s300/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, boost, catkin, diagnostic-msgs, roscpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-noetic-cob-sick-s300"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_sick_s300/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "3c56e17d4fcf9473d045ae51263f012391ba4dcf5dfc481f848a582b7644bd36"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_sick_s300/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "488690eee681032788e6e5b419f86fe12ddf04377769e6af7232cc6e6882a885"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-sound/default.nix b/distros/noetic/cob-sound/default.nix index 3079053958..56898d8f68 100644 --- a/distros/noetic/cob-sound/default.nix +++ b/distros/noetic/cob-sound/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, actionlib, actionlib-msgs, alsaOss, catkin, cob-srvs, diagnostic-msgs, message-generation, message-runtime, roscpp, rospy, std-msgs, std-srvs, visualization-msgs, vlc }: buildRosPackage { pname = "ros-noetic-cob-sound"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_sound/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "78d69a1845d520b06393f6c3618c8bf0d607664c4e7e79ae2aa7311adb827795"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_sound/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "af70146549c996710814d04c64c3891969dff78453d78c30e112aef2f6c07ad6"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-teleop/default.nix b/distros/noetic/cob-teleop/default.nix index ead57adfa3..e74d8a028a 100644 --- a/distros/noetic/cob-teleop/default.nix +++ b/distros/noetic/cob-teleop/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, actionlib, catkin, cob-actions, cob-light, cob-script-server, cob-sound, geometry-msgs, roscpp, sensor-msgs, std-msgs, std-srvs }: buildRosPackage { pname = "ros-noetic-cob-teleop"; - version = "0.6.27-r1"; + version = "0.6.28-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_teleop/0.6.27-1.tar.gz"; - name = "0.6.27-1.tar.gz"; - sha256 = "60fc73bf5cb39dcc5be8b5c3990ee85c0eb176953bada1c1eaf753aae789a38d"; + url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/cob_teleop/0.6.28-1.tar.gz"; + name = "0.6.28-1.tar.gz"; + sha256 = "6c0af771ae8da51ebe1b8bff718166782ae254444c08ea6e233377fb9825d10e"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-undercarriage-ctrl/default.nix b/distros/noetic/cob-undercarriage-ctrl/default.nix index 5bb19900c5..3849053b04 100644 --- a/distros/noetic/cob-undercarriage-ctrl/default.nix +++ b/distros/noetic/cob-undercarriage-ctrl/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-msgs, cob-utilities, control-msgs, diagnostic-msgs, diagnostic-updater, geometry-msgs, nav-msgs, roscpp, tf }: buildRosPackage { pname = "ros-noetic-cob-undercarriage-ctrl"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_undercarriage_ctrl/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "cef4adf5af65254263fa63c09366d041a597b2d1f0b2b3746a43dce964f1300d"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_undercarriage_ctrl/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "39ff226d9f5531983edaffb6b9fe7a0e93e2446295451e63f8a2f731e6f58192"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-utilities/default.nix b/distros/noetic/cob-utilities/default.nix index b1fb5b3dd3..380546dae8 100644 --- a/distros/noetic/cob-utilities/default.nix +++ b/distros/noetic/cob-utilities/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin }: buildRosPackage { pname = "ros-noetic-cob-utilities"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_utilities/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "54afd36df1e32578c35b7eb559c05622a2d126697540c499d242960783c9df6d"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_utilities/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "ef506b51f990915a1ae7be96f173d0de203d70f547702589419867058272b132"; }; buildType = "catkin"; diff --git a/distros/noetic/cob-voltage-control/default.nix b/distros/noetic/cob-voltage-control/default.nix index 539d8d0add..afae0da4f7 100644 --- a/distros/noetic/cob-voltage-control/default.nix +++ b/distros/noetic/cob-voltage-control/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cob-msgs, cob-phidgets, dynamic-reconfigure, python3Packages, roscpp, rospy, std-msgs }: buildRosPackage { pname = "ros-noetic-cob-voltage-control"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_voltage_control/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "f0097a60b2c6676a8a5b1fd8c77007002c5a331224b6fdddd8e6ba9d002ec21c"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/cob_voltage_control/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "bd21f7c884b3d25318f342bceaf6618fd61efc6b73e25827cb96c1593c0e9518"; }; buildType = "catkin"; diff --git a/distros/noetic/criutils/default.nix b/distros/noetic/criutils/default.nix index c5b4138c58..51f4662861 100644 --- a/distros/noetic/criutils/default.nix +++ b/distros/noetic/criutils/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The criutils package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/csm/default.nix b/distros/noetic/csm/default.nix index 6565324325..7edb22d06c 100644 --- a/distros/noetic/csm/default.nix +++ b/distros/noetic/csm/default.nix @@ -26,6 +26,6 @@ buildRosPackage { It is robust enough to be used in industrial prototypes of autonomous mobile robotics, for example at Kuka. CSM is used by a variety of people, though it is hard to keep track because of the open source distribution, especially as packaged in ROS. If you use this software for something cool, let me know. ''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/cvp-mesh-planner/default.nix b/distros/noetic/cvp-mesh-planner/default.nix index 07b619737c..72f313965b 100644 --- a/distros/noetic/cvp-mesh-planner/default.nix +++ b/distros/noetic/cvp-mesh-planner/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The Continuous Vector Field Planner (CVP) mesh planner package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/dijkstra-mesh-planner/default.nix b/distros/noetic/dijkstra-mesh-planner/default.nix index 05fa616b61..24836e934f 100644 --- a/distros/noetic/dijkstra-mesh-planner/default.nix +++ b/distros/noetic/dijkstra-mesh-planner/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The dijkstra_mesh_planner package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/downward/default.nix b/distros/noetic/downward/default.nix index 09e3d48bdb..5232591099 100644 --- a/distros/noetic/downward/default.nix +++ b/distros/noetic/downward/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''fast downward: PDDL Planner (http://www.fast-downward.org)''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/eiquadprog/default.nix b/distros/noetic/eiquadprog/default.nix index 51158d290f..a677068f84 100644 --- a/distros/noetic/eiquadprog/default.nix +++ b/distros/noetic/eiquadprog/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Eiquadprog a QP solver using active sets''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/eml/default.nix b/distros/noetic/eml/default.nix index 6fadb66204..72cf6d2164 100644 --- a/distros/noetic/eml/default.nix +++ b/distros/noetic/eml/default.nix @@ -19,6 +19,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 = with lib.licenses; [ "Binary Only" ]; + license = with lib.licenses; [ "Binary-Only" ]; }; } diff --git a/distros/noetic/ergodic-exploration/default.nix b/distros/noetic/ergodic-exploration/default.nix index bbc7989c44..293651f368 100644 --- a/distros/noetic/ergodic-exploration/default.nix +++ b/distros/noetic/ergodic-exploration/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Robot agnostic information theoretic exploration strategy''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/euslime/default.nix b/distros/noetic/euslime/default.nix new file mode 100644 index 0000000000..0248592dfb --- /dev/null +++ b/distros/noetic/euslime/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, catkin-virtualenv, roseus, slime-ros }: +buildRosPackage { + pname = "ros-noetic-euslime"; + version = "1.1.1-r1"; + + src = fetchurl { + url = "https://github.com/jsk-ros-pkg/euslime-release/archive/release/noetic/euslime/1.1.1-1.tar.gz"; + name = "1.1.1-1.tar.gz"; + sha256 = "0baa5371b2df2c86936dc54491dcf33357a9bd0c3e6eebc6ff681c476fa9c149"; + }; + + buildType = "catkin"; + buildInputs = [ catkin-virtualenv ]; + propagatedBuildInputs = [ roseus slime-ros ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''EusLisp meets SLIME''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/noetic/fath-pivot-mount-description/default.nix b/distros/noetic/fath-pivot-mount-description/default.nix new file mode 100644 index 0000000000..a6245e2ee3 --- /dev/null +++ b/distros/noetic/fath-pivot-mount-description/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, urdf, xacro }: +buildRosPackage { + pname = "ros-noetic-fath-pivot-mount-description"; + version = "0.1.1-r2"; + + src = fetchurl { + url = "https://github.com/clearpath-gbp/fath_pivot_mount_description-release/archive/release/noetic/fath_pivot_mount_description/0.1.1-2.tar.gz"; + name = "0.1.1-2.tar.gz"; + sha256 = "dfa286a7988dce4a8466f53ccb233e3d4055b649f3874466a681342cee84c77f"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ urdf xacro ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''URDF Macro for adding an adjustable, fath pivot mount used for cameras and other sensors''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/noetic/fetch-description/default.nix b/distros/noetic/fetch-description/default.nix index 5aa5cf5b36..4f92203399 100644 --- a/distros/noetic/fetch-description/default.nix +++ b/distros/noetic/fetch-description/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''URDF for Fetch Robot.''; - license = with lib.licenses; [ "CC-BY-SA-3.0" ]; + license = with lib.licenses; [ cc-by-nc-sa-40 ]; }; } diff --git a/distros/noetic/fetch-open-auto-dock/default.nix b/distros/noetic/fetch-open-auto-dock/default.nix index fe8da75578..81278e2d32 100644 --- a/distros/noetic/fetch-open-auto-dock/default.nix +++ b/distros/noetic/fetch-open-auto-dock/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''An open-source version of the Fetch charge docking system.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/ff/default.nix b/distros/noetic/ff/default.nix index d207f7ae6f..228c691143 100644 --- a/distros/noetic/ff/default.nix +++ b/distros/noetic/ff/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ff: pddl planner. see http://www.loria.fr/~hoffmanj/ff.html''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/ffha/default.nix b/distros/noetic/ffha/default.nix index ea9919af66..215c37cd09 100644 --- a/distros/noetic/ffha/default.nix +++ b/distros/noetic/ffha/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ffha: PDDL Planner (http://ipc.informatik.uni-freiburg.de)''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/fkie-node-manager/default.nix b/distros/noetic/fkie-node-manager/default.nix index fdf03046fc..8e9348feff 100644 --- a/distros/noetic/fkie-node-manager/default.nix +++ b/distros/noetic/fkie-node-manager/default.nix @@ -22,6 +22,6 @@ buildRosPackage { 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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-some-icons-are-licensed-under-LGPL-or-CC-BY-NC-3.0" ]; }; } diff --git a/distros/noetic/flir-camera-description/default.nix b/distros/noetic/flir-camera-description/default.nix new file mode 100644 index 0000000000..ab23979d3d --- /dev/null +++ b/distros/noetic/flir-camera-description/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, robot-state-publisher, urdf, xacro }: +buildRosPackage { + pname = "ros-noetic-flir-camera-description"; + version = "0.2.1-r1"; + + src = fetchurl { + url = "https://github.com/ros-drivers-gbp/flir_camera_driver-release/archive/release/noetic/flir_camera_description/0.2.1-1.tar.gz"; + name = "0.2.1-1.tar.gz"; + sha256 = "1ce22f64636aa9e5653ee0802d835149b980fdf37864292b423c4805d869c22c"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ robot-state-publisher urdf xacro ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''URDF descriptions for Flir cameras''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/noetic/flir-camera-driver/default.nix b/distros/noetic/flir-camera-driver/default.nix new file mode 100644 index 0000000000..543b267ee9 --- /dev/null +++ b/distros/noetic/flir-camera-driver/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, flir-camera-description, spinnaker-camera-driver }: +buildRosPackage { + pname = "ros-noetic-flir-camera-driver"; + version = "0.2.1-r1"; + + src = fetchurl { + url = "https://github.com/ros-drivers-gbp/flir_camera_driver-release/archive/release/noetic/flir_camera_driver/0.2.1-1.tar.gz"; + name = "0.2.1-1.tar.gz"; + sha256 = "e96cf184635319e217b3799bf62b64c12f949ecfded4c6960da579af6c034074"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ flir-camera-description spinnaker-camera-driver ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''A set of drivers for Flir cameras based on the Spinnaker SDK.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/noetic/frame-editor/default.nix b/distros/noetic/frame-editor/default.nix new file mode 100644 index 0000000000..324ca7965e --- /dev/null +++ b/distros/noetic/frame-editor/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, dynamic-reconfigure, geometry-msgs, interactive-markers, message-generation, message-runtime, qt-gui-py-common, rospy, rqt-gui, rqt-gui-py, std-msgs, tf, visualization-msgs }: +buildRosPackage { + pname = "ros-noetic-frame-editor"; + version = "1.1.0-r1"; + + src = fetchurl { + url = "https://github.com/ipa320/rqt_frame_editor_plugin-release/archive/release/noetic/frame_editor/1.1.0-1.tar.gz"; + name = "1.1.0-1.tar.gz"; + sha256 = "e404f3927e62cec49613aa897f8c18d25a7f21d1c6aab60aaa1030720344bfc9"; + }; + + buildType = "catkin"; + buildInputs = [ message-generation ]; + propagatedBuildInputs = [ dynamic-reconfigure geometry-msgs interactive-markers message-runtime qt-gui-py-common rospy rqt-gui rqt-gui-py std-msgs tf visualization-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''The frame_editor package''; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/distros/noetic/gazebo-plugins/default.nix b/distros/noetic/gazebo-plugins/default.nix index 5e9b2d716e..7fc89e5eb4 100644 --- a/distros/noetic/gazebo-plugins/default.nix +++ b/distros/noetic/gazebo-plugins/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components.''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-&-Apache-2.0" ]; }; } diff --git a/distros/noetic/gazebo-ros-pkgs/default.nix b/distros/noetic/gazebo-ros-pkgs/default.nix index e2ee001ec0..b9e3ed77e2 100644 --- a/distros/noetic/gazebo-ros-pkgs/default.nix +++ b/distros/noetic/gazebo-ros-pkgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Interface for using ROS with the Gazebo simulator.''; - license = with lib.licenses; [ bsd2 ]; + license = with lib.licenses; [ "BSD-&-LGPL-&-Apache-2.0" ]; }; } diff --git a/distros/noetic/gazebo-video-monitor-msgs/default.nix b/distros/noetic/gazebo-video-monitor-msgs/default.nix index 511978eeb8..ee0299356c 100644 --- a/distros/noetic/gazebo-video-monitor-msgs/default.nix +++ b/distros/noetic/gazebo-video-monitor-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''gazebo_video_monitor_msgs defines interfaces for the gazebo_video_monitor_plugins package.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/gazebo-video-monitor-plugins/default.nix b/distros/noetic/gazebo-video-monitor-plugins/default.nix index 1bb6965cc6..f31a221400 100644 --- a/distros/noetic/gazebo-video-monitor-plugins/default.nix +++ b/distros/noetic/gazebo-video-monitor-plugins/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''gazebo_video_monitor_plugins is a package that lets the user record videos of a Gazebo simulation. It provides a multicamera sensor that can be used for creating different types of videos with multiple views from inside the gazebo world. There is a number of plugins already available in the package, but more can be developed by the user, with minimal effort, to fit arbitrary use cases.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/gazebo-video-monitor-utils/default.nix b/distros/noetic/gazebo-video-monitor-utils/default.nix index 98aafa90d1..26ed9dff1f 100644 --- a/distros/noetic/gazebo-video-monitor-utils/default.nix +++ b/distros/noetic/gazebo-video-monitor-utils/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''gazebo_video_monitor_utils contains utility scripts that are meant to interact with the gazebo video monitor plugins.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/gazebo-video-monitors/default.nix b/distros/noetic/gazebo-video-monitors/default.nix index fe588fdc14..8c11e1e0b2 100644 --- a/distros/noetic/gazebo-video-monitors/default.nix +++ b/distros/noetic/gazebo-video-monitors/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Metapackage that groups together the gazebo_video_monitors packages.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/generated.nix b/distros/noetic/generated.nix index a17b74e950..1e2dad77a8 100644 --- a/distros/noetic/generated.nix +++ b/distros/noetic/generated.nix @@ -724,6 +724,8 @@ self: super: { ethercat-trigger-controllers = self.callPackage ./ethercat-trigger-controllers {}; + euslime = self.callPackage ./euslime {}; + euslisp = self.callPackage ./euslisp {}; executive-smach = self.callPackage ./executive-smach {}; @@ -784,6 +786,8 @@ self: super: { fake-localization = self.callPackage ./fake-localization {}; + fath-pivot-mount-description = self.callPackage ./fath-pivot-mount-description {}; + fcl = self.callPackage ./fcl {}; fcl-catkin = self.callPackage ./fcl-catkin {}; @@ -866,6 +870,10 @@ self: super: { flexbe-widget = self.callPackage ./flexbe-widget {}; + flir-camera-description = self.callPackage ./flir-camera-description {}; + + flir-camera-driver = self.callPackage ./flir-camera-driver {}; + floam = self.callPackage ./floam {}; fmi-adapter = self.callPackage ./fmi-adapter {}; @@ -882,6 +890,8 @@ self: super: { foxglove-msgs = self.callPackage ./foxglove-msgs {}; + frame-editor = self.callPackage ./frame-editor {}; + franka-control = self.callPackage ./franka-control {}; franka-description = self.callPackage ./franka-description {}; @@ -1116,6 +1126,8 @@ self: super: { hokuyo3d = self.callPackage ./hokuyo3d {}; + hpp-fcl = self.callPackage ./hpp-fcl {}; + hri = self.callPackage ./hri {}; hri-msgs = self.callPackage ./hri-msgs {}; @@ -1474,8 +1486,6 @@ self: super: { lockfree = self.callPackage ./lockfree {}; - lockmount-description = self.callPackage ./lockmount-description {}; - locomotor = self.callPackage ./locomotor {}; locomotor-msgs = self.callPackage ./locomotor-msgs {}; @@ -1488,6 +1498,8 @@ self: super: { lusb = self.callPackage ./lusb {}; + magic-enum = self.callPackage ./magic-enum {}; + magical-ros2-conversion-tool = self.callPackage ./magical-ros2-conversion-tool {}; map-laser = self.callPackage ./map-laser {}; @@ -1932,6 +1944,10 @@ self: super: { pacmod-msgs = self.callPackage ./pacmod-msgs {}; + paho-mqtt-c = self.callPackage ./paho-mqtt-c {}; + + paho-mqtt-cpp = self.callPackage ./paho-mqtt-cpp {}; + panda-moveit-config = self.callPackage ./panda-moveit-config {}; parameter-pa = self.callPackage ./parameter-pa {}; @@ -2482,6 +2498,8 @@ self: super: { rosdoc-lite = self.callPackage ./rosdoc-lite {}; + rosee-msg = self.callPackage ./rosee-msg {}; + rosemacs = self.callPackage ./rosemacs {}; roseus = self.callPackage ./roseus {}; @@ -2864,6 +2882,8 @@ self: super: { speed-scaling-state-controller = self.callPackage ./speed-scaling-state-controller {}; + spinnaker-camera-driver = self.callPackage ./spinnaker-camera-driver {}; + sr-hand-detector = self.callPackage ./sr-hand-detector {}; srdfdom = self.callPackage ./srdfdom {}; @@ -3008,6 +3028,24 @@ self: super: { topic-tools = self.callPackage ./topic-tools {}; + toposens = self.callPackage ./toposens {}; + + toposens-bringup = self.callPackage ./toposens-bringup {}; + + toposens-description = self.callPackage ./toposens-description {}; + + toposens-driver = self.callPackage ./toposens-driver {}; + + toposens-echo-driver = self.callPackage ./toposens-echo-driver {}; + + toposens-markers = self.callPackage ./toposens-markers {}; + + toposens-msgs = self.callPackage ./toposens-msgs {}; + + toposens-pointcloud = self.callPackage ./toposens-pointcloud {}; + + toposens-sync = self.callPackage ./toposens-sync {}; + trac-ik = self.callPackage ./trac-ik {}; trac-ik-examples = self.callPackage ./trac-ik-examples {}; diff --git a/distros/noetic/generic-throttle/default.nix b/distros/noetic/generic-throttle/default.nix index 225cf7b78d..72b0165237 100644 --- a/distros/noetic/generic-throttle/default.nix +++ b/distros/noetic/generic-throttle/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cv-bridge, python3Packages, rospy, rostopic }: buildRosPackage { pname = "ros-noetic-generic-throttle"; - version = "0.6.27-r1"; + version = "0.6.28-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/generic_throttle/0.6.27-1.tar.gz"; - name = "0.6.27-1.tar.gz"; - sha256 = "97ef0975e870870524ee365abfb050edc20e53c9b6b2e2f9b1755f1925274bf2"; + url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/generic_throttle/0.6.28-1.tar.gz"; + name = "0.6.28-1.tar.gz"; + sha256 = "74169e90b370d0f20dd47018e96edc590010a23b975349d169d1f600ddde07cd"; }; buildType = "catkin"; diff --git a/distros/noetic/gmcl/default.nix b/distros/noetic/gmcl/default.nix index f2fe58d9d8..51e429b9c4 100644 --- a/distros/noetic/gmcl/default.nix +++ b/distros/noetic/gmcl/default.nix @@ -30,6 +30,6 @@ buildRosPackage {

Main node structure and amcl-algorithms’s code was derived, with thanks, from Brian Gerkey's amcl package.

''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/graceful-controller-ros/default.nix b/distros/noetic/graceful-controller-ros/default.nix index a54cb685b6..0a977d00ec 100644 --- a/distros/noetic/graceful-controller-ros/default.nix +++ b/distros/noetic/graceful-controller-ros/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, angles, base-local-planner, catkin, costmap-2d, dynamic-reconfigure, geometry-msgs, graceful-controller, nav-core, nav-msgs, pluginlib, roscpp, std-msgs, tf2-geometry-msgs, tf2-ros }: buildRosPackage { pname = "ros-noetic-graceful-controller-ros"; - version = "0.4.0-r1"; + version = "0.4.1-r1"; src = fetchurl { - url = "https://github.com/mikeferguson/graceful_controller-gbp/archive/release/noetic/graceful_controller_ros/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "957ba8bc12549f73afb8f9f9d54b8dc9072e8c3005dd3bdafc54ab211edd3501"; + url = "https://github.com/mikeferguson/graceful_controller-gbp/archive/release/noetic/graceful_controller_ros/0.4.1-1.tar.gz"; + name = "0.4.1-1.tar.gz"; + sha256 = "dbf471ed9f9227880baa95f95e1ce2f58d39867fcd4e4cc3244f095cf5ec77ec"; }; buildType = "catkin"; diff --git a/distros/noetic/graceful-controller/default.nix b/distros/noetic/graceful-controller/default.nix index 0a035a5684..77c5b6812a 100644 --- a/distros/noetic/graceful-controller/default.nix +++ b/distros/noetic/graceful-controller/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, angles, catkin, roscpp }: buildRosPackage { pname = "ros-noetic-graceful-controller"; - version = "0.4.0-r1"; + version = "0.4.1-r1"; src = fetchurl { - url = "https://github.com/mikeferguson/graceful_controller-gbp/archive/release/noetic/graceful_controller/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "7a108688036ed6803dc0a9560ff0ee23d2fb26c325d1ea4b994767fd501f3e9e"; + url = "https://github.com/mikeferguson/graceful_controller-gbp/archive/release/noetic/graceful_controller/0.4.1-1.tar.gz"; + name = "0.4.1-1.tar.gz"; + sha256 = "0228d4c198dc85dd886df9ca9a96299fbb202bfbb67bdf056e719c9ce181ceba"; }; buildType = "catkin"; @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''A controller.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/grepros/default.nix b/distros/noetic/grepros/default.nix index b60546430e..09c94716ad 100644 --- a/distros/noetic/grepros/default.nix +++ b/distros/noetic/grepros/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, genpy, python3Packages, rosbag, roslib, rospy, rostest, std-msgs }: buildRosPackage { pname = "ros-noetic-grepros"; - version = "0.4.0-r1"; + version = "0.4.4-r1"; src = fetchurl { - url = "https://github.com/suurjaak/grepros-release/archive/release/noetic/grepros/0.4.0-1.tar.gz"; - name = "0.4.0-1.tar.gz"; - sha256 = "7fb2a6d4a13bd75df46bc29556759d563722f461490db315a97f447b942c0609"; + url = "https://github.com/suurjaak/grepros-release/archive/release/noetic/grepros/0.4.4-1.tar.gz"; + name = "0.4.4-1.tar.gz"; + sha256 = "2b162595da82c9719e088b15449b86f2804240d03f3adb5328d4a28b10275d1c"; }; buildType = "catkin"; diff --git a/distros/noetic/handeye/default.nix b/distros/noetic/handeye/default.nix index 6554d507a3..6457713a22 100644 --- a/distros/noetic/handeye/default.nix +++ b/distros/noetic/handeye/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''The handeye package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/hdf5-map-io/default.nix b/distros/noetic/hdf5-map-io/default.nix index ce03d6da60..a06d4eece5 100644 --- a/distros/noetic/hdf5-map-io/default.nix +++ b/distros/noetic/hdf5-map-io/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The hdf5_map_io package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/hebi-cpp-api/default.nix b/distros/noetic/hebi-cpp-api/default.nix index bac1d77dda..a241bb3c01 100644 --- a/distros/noetic/hebi-cpp-api/default.nix +++ b/distros/noetic/hebi-cpp-api/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''A ROS package providing access to the HEBI C++ API.''; - license = with 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/distros/noetic/hpp-fcl/default.nix b/distros/noetic/hpp-fcl/default.nix new file mode 100644 index 0000000000..1d421464ee --- /dev/null +++ b/distros/noetic/hpp-fcl/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, assimp, boost, catkin, cmake, doxygen, eigen, eigenpy, git, octomap, python3, python3Packages }: +buildRosPackage { + pname = "ros-noetic-hpp-fcl"; + version = "1.8.1-r1"; + + src = fetchurl { + url = "https://github.com/humanoid-path-planner/hpp-fcl-ros-release/archive/release/noetic/hpp-fcl/1.8.1-1.tar.gz"; + name = "1.8.1-1.tar.gz"; + sha256 = "0e77963fcce64b51ec4f27c9a196757af2d0783feb5463b784b87a1e8fc62399"; + }; + + buildType = "cmake"; + buildInputs = [ doxygen git python3Packages.lxml ]; + propagatedBuildInputs = [ assimp boost catkin eigen eigenpy octomap python3 python3Packages.numpy ]; + nativeBuildInputs = [ cmake ]; + + meta = { + description = ''An extension of the Flexible Collision Library.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/noetic/ifm3d-core/default.nix b/distros/noetic/ifm3d-core/default.nix index 3e992490a4..729c70249f 100644 --- a/distros/noetic/ifm3d-core/default.nix +++ b/distros/noetic/ifm3d-core/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Library and Utilities for working with ifm pmd-based 3D ToF Cameras''; - license = with lib.licenses; [ "Apache-1.0" ]; + license = with lib.licenses; [ "Apache" ]; }; } diff --git a/distros/noetic/imagesift/default.nix b/distros/noetic/imagesift/default.nix index d63a3b901d..c15b6c27d7 100644 --- a/distros/noetic/imagesift/default.nix +++ b/distros/noetic/imagesift/default.nix @@ -23,6 +23,6 @@ buildRosPackage { 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 = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/imu-filter-madgwick/default.nix b/distros/noetic/imu-filter-madgwick/default.nix index 0cc84f2fb9..95ec1ce59d 100644 --- a/distros/noetic/imu-filter-madgwick/default.nix +++ b/distros/noetic/imu-filter-madgwick/default.nix @@ -20,6 +20,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 = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/imu-from-ios-sensorlog/default.nix b/distros/noetic/imu-from-ios-sensorlog/default.nix index bd51a5d124..1e3f871ea4 100644 --- a/distros/noetic/imu-from-ios-sensorlog/default.nix +++ b/distros/noetic/imu-from-ios-sensorlog/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The imu_from_ios_sensorlog package''; - license = with lib.licenses; [ "TODO" ]; + license = with lib.licenses; [ "TODO-CATKIN-PACKAGE-LICENSE" ]; }; } diff --git a/distros/noetic/imu-pipeline/default.nix b/distros/noetic/imu-pipeline/default.nix index 5f5f8a808f..ed15b04016 100644 --- a/distros/noetic/imu-pipeline/default.nix +++ b/distros/noetic/imu-pipeline/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''imu_pipeline''; - license = with lib.licenses; [ bsdOriginal gpl1 ]; + license = with lib.licenses; [ bsdOriginal "GPL" ]; }; } diff --git a/distros/noetic/imu-tools/default.nix b/distros/noetic/imu-tools/default.nix index f260fb70ed..aa07f23315 100644 --- a/distros/noetic/imu-tools/default.nix +++ b/distros/noetic/imu-tools/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Various tools for IMU devices''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-GPL" ]; }; } diff --git a/distros/noetic/imu-transformer/default.nix b/distros/noetic/imu-transformer/default.nix index a21129bdd9..64d9465d81 100644 --- a/distros/noetic/imu-transformer/default.nix +++ b/distros/noetic/imu-transformer/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another.''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/ipcamera-driver/default.nix b/distros/noetic/ipcamera-driver/default.nix index 8bcd550e55..d7e79b0137 100644 --- a/distros/noetic/ipcamera-driver/default.nix +++ b/distros/noetic/ipcamera-driver/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Simple node to publish regular IP camera video streams to a ros topic.''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/ivcon/default.nix b/distros/noetic/ivcon/default.nix index 3535784cab..ab35878f19 100644 --- a/distros/noetic/ivcon/default.nix +++ b/distros/noetic/ivcon/default.nix @@ -24,6 +24,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 = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/jackal-control/default.nix b/distros/noetic/jackal-control/default.nix index 18392c5d46..d5d5f1af25 100644 --- a/distros/noetic/jackal-control/default.nix +++ b/distros/noetic/jackal-control/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, controller-manager, diff-drive-controller, interactive-marker-twist-server, joint-state-controller, joy, robot-localization, roslaunch, teleop-twist-joy, topic-tools, twist-mux }: buildRosPackage { pname = "ros-noetic-jackal-control"; - version = "0.8.2-r1"; + version = "0.8.3-r1"; src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_control/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "b162798840859474434b5e66d06cae31713aab0f1ab7b4cea5386d0d84188dd7"; + url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_control/0.8.3-1.tar.gz"; + name = "0.8.3-1.tar.gz"; + sha256 = "a01d15d776eaabad0d76456846ae88bce29df2ba8f6444cc17aaf8a8c17584ca"; }; buildType = "catkin"; diff --git a/distros/noetic/jackal-description/default.nix b/distros/noetic/jackal-description/default.nix index 14f6a83ff5..55ac710903 100644 --- a/distros/noetic/jackal-description/default.nix +++ b/distros/noetic/jackal-description/default.nix @@ -2,20 +2,20 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, lms1xx, pointgrey-camera-description, robot-state-publisher, roslaunch, urdf, velodyne-description, xacro }: +{ lib, buildRosPackage, fetchurl, catkin, lms1xx, pointgrey-camera-description, robot-state-publisher, roslaunch, sick-tim, urdf, velodyne-description, xacro }: buildRosPackage { pname = "ros-noetic-jackal-description"; - version = "0.8.2-r1"; + version = "0.8.3-r1"; src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_description/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "250b3be524f51ce0b12dce6cfb4df7c6260f321a2be4bc8f87b47ce84bf53f56"; + url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_description/0.8.3-1.tar.gz"; + name = "0.8.3-1.tar.gz"; + sha256 = "fafb0d5f722af145a6a75146954a0726479b216a38af040d760c9885fe3aa222"; }; buildType = "catkin"; buildInputs = [ roslaunch ]; - propagatedBuildInputs = [ lms1xx pointgrey-camera-description robot-state-publisher urdf velodyne-description xacro ]; + propagatedBuildInputs = [ lms1xx pointgrey-camera-description robot-state-publisher sick-tim urdf velodyne-description xacro ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/jackal-msgs/default.nix b/distros/noetic/jackal-msgs/default.nix index 13f792bba5..66323a9c05 100644 --- a/distros/noetic/jackal-msgs/default.nix +++ b/distros/noetic/jackal-msgs/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, std-msgs }: buildRosPackage { pname = "ros-noetic-jackal-msgs"; - version = "0.8.2-r1"; + version = "0.8.3-r1"; src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_msgs/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "730f22e8f5366b4d2908906953ed1b722874759273b79549df5c24c9f2e9e80d"; + url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_msgs/0.8.3-1.tar.gz"; + name = "0.8.3-1.tar.gz"; + sha256 = "aca1a9ae52c82428c22c005347d3a499a3c19bcb38208c2029d0c17e5a414607"; }; buildType = "catkin"; diff --git a/distros/noetic/jackal-navigation/default.nix b/distros/noetic/jackal-navigation/default.nix index 96e67f4d7c..48de7f1f92 100644 --- a/distros/noetic/jackal-navigation/default.nix +++ b/distros/noetic/jackal-navigation/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, amcl, catkin, gmapping, map-server, move-base, roslaunch, urdf, xacro }: buildRosPackage { pname = "ros-noetic-jackal-navigation"; - version = "0.8.2-r1"; + version = "0.8.3-r1"; src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_navigation/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "56a7d9fb1daf75b1f0f50d7c114c66ad78e692f29abecc909043c097fd832e94"; + url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_navigation/0.8.3-1.tar.gz"; + name = "0.8.3-1.tar.gz"; + sha256 = "f91d8e845e0415299b5800912139f6c8e16a31d6c07d66fbc6495f634366448d"; }; buildType = "catkin"; diff --git a/distros/noetic/jackal-tutorials/default.nix b/distros/noetic/jackal-tutorials/default.nix index 1beb580798..1bcf4599e1 100644 --- a/distros/noetic/jackal-tutorials/default.nix +++ b/distros/noetic/jackal-tutorials/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, rosdoc-lite }: buildRosPackage { pname = "ros-noetic-jackal-tutorials"; - version = "0.8.2-r1"; + version = "0.8.3-r1"; src = fetchurl { - url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_tutorials/0.8.2-1.tar.gz"; - name = "0.8.2-1.tar.gz"; - sha256 = "c298a327681f7e615e6539b3618cb156e223711f50c729d1556c70aa8f186556"; + url = "https://github.com/clearpath-gbp/jackal-release/archive/release/noetic/jackal_tutorials/0.8.3-1.tar.gz"; + name = "0.8.3-1.tar.gz"; + sha256 = "6a10adef088e593f1d733c9a31704b747169d9ca3cbaf32d403d97c1cc1080bd"; }; buildType = "catkin"; diff --git a/distros/noetic/julius/default.nix b/distros/noetic/julius/default.nix index a35259dbf6..919ad37916 100644 --- a/distros/noetic/julius/default.nix +++ b/distros/noetic/julius/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''julius: Open-Source Large Vocabulary CSR Engine (http://julius.sourceforge.jp/index.php)''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/label-manager/default.nix b/distros/noetic/label-manager/default.nix index 8ca1b5d16b..2e01cbd77a 100644 --- a/distros/noetic/label-manager/default.nix +++ b/distros/noetic/label-manager/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Serving and persisting label information''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/laser-scan-densifier/default.nix b/distros/noetic/laser-scan-densifier/default.nix index 930d551e04..d854067eb2 100644 --- a/distros/noetic/laser-scan-densifier/default.nix +++ b/distros/noetic/laser-scan-densifier/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, nodelet, roscpp, sensor-msgs }: buildRosPackage { pname = "ros-noetic-laser-scan-densifier"; - version = "0.7.11-r1"; + version = "0.7.12-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/laser_scan_densifier/0.7.11-1.tar.gz"; - name = "0.7.11-1.tar.gz"; - sha256 = "a60a3e21ad41b4db8204cef4d0d4622f5d1aca8b1f3a55e279fec391ebfd4bda"; + url = "https://github.com/ipa320/cob_driver-release/archive/release/noetic/laser_scan_densifier/0.7.12-1.tar.gz"; + name = "0.7.12-1.tar.gz"; + sha256 = "7efdb98150f84c6bc67f5416fe08325e05e65b1b590f1b7d0b2845375336536e"; }; buildType = "catkin"; diff --git a/distros/noetic/laser-scan-matcher/default.nix b/distros/noetic/laser-scan-matcher/default.nix index ccb6a71f9f..0abcde1d49 100644 --- a/distros/noetic/laser-scan-matcher/default.nix +++ b/distros/noetic/laser-scan-matcher/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''

An incremental laser scan matcher, using Andrea Censi's Canonical Scan Matcher (CSM) implementation. See the web site for more about CSM. NOTE the CSM library is licensed under the GNU Lesser General Public License v3, whereas the rest of the code is released under the BSD license.

''; - license = with lib.licenses; [ bsdOriginal lgpl2 ]; + license = with lib.licenses; [ bsdOriginal "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/leo-bringup/default.nix b/distros/noetic/leo-bringup/default.nix index 3e550c6b77..7c42c785a1 100644 --- a/distros/noetic/leo-bringup/default.nix +++ b/distros/noetic/leo-bringup/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, geometry-msgs, leo-description, leo-fw, robot-state-publisher, rosapi, rosbridge-server, rosserial-python, sensor-msgs, web-video-server, xacro }: buildRosPackage { pname = "ros-noetic-leo-bringup"; - version = "2.1.1-r1"; + version = "2.2.0-r1"; src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_robot-release/archive/release/noetic/leo_bringup/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "e01e5e55d3a99680f1776d0825d6966542701ff67c9d4c590564f9d73bf4e729"; + url = "https://github.com/fictionlab-gbp/leo_robot-release/archive/release/noetic/leo_bringup/2.2.0-1.tar.gz"; + name = "2.2.0-1.tar.gz"; + sha256 = "c2b65e355f442839c47bc9ca49a83eeda7b47241552261818422f428707d32b8"; }; buildType = "catkin"; diff --git a/distros/noetic/leo-fw/default.nix b/distros/noetic/leo-fw/default.nix index 59c13000a5..98e351af3c 100644 --- a/distros/noetic/leo-fw/default.nix +++ b/distros/noetic/leo-fw/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, leo-msgs, nav-msgs, python3Packages, roscpp, rosgraph, rosmon-msgs, rosnode, rospy, rosservice, sensor-msgs, std-srvs }: buildRosPackage { pname = "ros-noetic-leo-fw"; - version = "2.1.1-r1"; + version = "2.2.0-r1"; src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_robot-release/archive/release/noetic/leo_fw/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "2be53278f90953952edafa0b613c32b127136f163956e019966c63133441220e"; + url = "https://github.com/fictionlab-gbp/leo_robot-release/archive/release/noetic/leo_fw/2.2.0-1.tar.gz"; + name = "2.2.0-1.tar.gz"; + sha256 = "bd402157bdf1500ac393d5c0e7a8d0e7f719473cc7277df10220c0552630379d"; }; buildType = "catkin"; diff --git a/distros/noetic/leo-robot/default.nix b/distros/noetic/leo-robot/default.nix index e7aa20f51a..326e6488a1 100644 --- a/distros/noetic/leo-robot/default.nix +++ b/distros/noetic/leo-robot/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, leo, leo-bringup, leo-fw }: buildRosPackage { pname = "ros-noetic-leo-robot"; - version = "2.1.1-r1"; + version = "2.2.0-r1"; src = fetchurl { - url = "https://github.com/fictionlab-gbp/leo_robot-release/archive/release/noetic/leo_robot/2.1.1-1.tar.gz"; - name = "2.1.1-1.tar.gz"; - sha256 = "5825d14bb9749a38a87ea6c8795ab25f458e672a48eb2bc53dd5ca790a58cfa3"; + url = "https://github.com/fictionlab-gbp/leo_robot-release/archive/release/noetic/leo_robot/2.2.0-1.tar.gz"; + name = "2.2.0-1.tar.gz"; + sha256 = "c9204f7a7f97817e3d1a4a483094c5b5fff81eb803dead693f122832d152e2cc"; }; buildType = "catkin"; diff --git a/distros/noetic/libdlib/default.nix b/distros/noetic/libdlib/default.nix index 1d0d18670c..19ae69a4d4 100644 --- a/distros/noetic/libdlib/default.nix +++ b/distros/noetic/libdlib/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package wraps the external c++ library dlib (http://dlib.net/) in a ROS package, so other packages can use it. The code was obtained from https://github.com/davisking/dlib . For further descriptions and tutorials see the Makefile.tarball and http://dlib.net/ .''; - license = with lib.licenses; [ boost ]; + license = with lib.licenses; [ "BSL-1.0" ]; }; } diff --git a/distros/noetic/libfranka/default.nix b/distros/noetic/libfranka/default.nix index 7ae61f1c01..a737a126c5 100644 --- a/distros/noetic/libfranka/default.nix +++ b/distros/noetic/libfranka/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cmake, eigen, poco }: buildRosPackage { pname = "ros-noetic-libfranka"; - version = "0.8.0-r4"; + version = "0.9.0-r2"; src = fetchurl { - url = "https://github.com/frankaemika/libfranka-release/archive/release/noetic/libfranka/0.8.0-4.tar.gz"; - name = "0.8.0-4.tar.gz"; - sha256 = "57aa6bf7475f06a2446e18d34f59b3137037c376ec6c2d9fc08ecfdd914368cb"; + url = "https://github.com/frankaemika/libfranka-release/archive/release/noetic/libfranka/0.9.0-2.tar.gz"; + name = "0.9.0-2.tar.gz"; + sha256 = "50343f955f431915e488370fd0b278abf24d92db907ff3eb36ed11feda2f6b2a"; }; buildType = "cmake"; diff --git a/distros/noetic/libmavconn/default.nix b/distros/noetic/libmavconn/default.nix index a53aaf87d6..43f9294a84 100644 --- a/distros/noetic/libmavconn/default.nix +++ b/distros/noetic/libmavconn/default.nix @@ -24,6 +24,6 @@ buildRosPackage { and URL to connection object mapper. This library can be used in standalone programs.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/noetic/libntcan/default.nix b/distros/noetic/libntcan/default.nix index ea1e1e4193..08c5240289 100644 --- a/distros/noetic/libntcan/default.nix +++ b/distros/noetic/libntcan/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package wraps the libntcan to use it as a ros dependency.''; - license = with lib.licenses; [ "proprietary" ]; + license = with lib.licenses; [ "Proprietary" ]; }; } diff --git a/distros/noetic/libpcan/default.nix b/distros/noetic/libpcan/default.nix index 8b2a670217..bd213f46ee 100644 --- a/distros/noetic/libpcan/default.nix +++ b/distros/noetic/libpcan/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package wraps the libpcan to use it as a ros dependency''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/libphidget22/default.nix b/distros/noetic/libphidget22/default.nix index a617be9f8b..1394aa8585 100644 --- a/distros/noetic/libphidget22/default.nix +++ b/distros/noetic/libphidget22/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package wraps the libphidget22 to use it as a ROS dependency''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/libphidgets/default.nix b/distros/noetic/libphidgets/default.nix index 4ad1c80c26..d02a862d88 100644 --- a/distros/noetic/libphidgets/default.nix +++ b/distros/noetic/libphidgets/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package wraps the libphidgets to use it as a ros dependency''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/libsiftfast/default.nix b/distros/noetic/libsiftfast/default.nix index 08d99fa49e..b5713c0b5f 100644 --- a/distros/noetic/libsiftfast/default.nix +++ b/distros/noetic/libsiftfast/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Library to compute SIFT features''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/lms1xx/default.nix b/distros/noetic/lms1xx/default.nix index c3fc4fca93..cd0607b922 100644 --- a/distros/noetic/lms1xx/default.nix +++ b/distros/noetic/lms1xx/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The lms1xx package contains a basic ROS driver for the SICK LMS1xx line of LIDARs.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/lpg-planner/default.nix b/distros/noetic/lpg-planner/default.nix index 8b8049e15a..d74f26446d 100644 --- a/distros/noetic/lpg-planner/default.nix +++ b/distros/noetic/lpg-planner/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''lpg_planner: LPGL Planner (http://zeus.ing.unibs.it/lpg/)''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/magic-enum/default.nix b/distros/noetic/magic-enum/default.nix new file mode 100644 index 0000000000..8d397c5167 --- /dev/null +++ b/distros/noetic/magic-enum/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, cmake }: +buildRosPackage { + pname = "ros-noetic-magic-enum"; + version = "0.7.3-r1"; + + src = fetchurl { + url = "https://github.com/nobleo/magic_enum-release/archive/release/noetic/magic_enum/0.7.3-1.tar.gz"; + name = "0.7.3-1.tar.gz"; + sha256 = "e202abeeafa9e4ed596c9e5d44a6627d95d9886e606e604cccbc57ff1b68bdcb"; + }; + + buildType = "cmake"; + nativeBuildInputs = [ cmake ]; + + meta = { + description = ''Static reflection for enums (to string, from string, iteration) for modern C++, + work with any enum type without any macro or boilerplate code''; + license = with lib.licenses; [ mit ]; + }; +} diff --git a/distros/noetic/mavlink/default.nix b/distros/noetic/mavlink/default.nix index c8b37eb24e..c48a292819 100644 --- a/distros/noetic/mavlink/default.nix +++ b/distros/noetic/mavlink/default.nix @@ -24,6 +24,6 @@ buildRosPackage { for both 1.0 and 2.0 versions of protocol. For pymavlink use separate install via rosdep (python-pymavlink).''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/mavros-extras/default.nix b/distros/noetic/mavros-extras/default.nix index 5d6bf9c506..ac5d2d2957 100644 --- a/distros/noetic/mavros-extras/default.nix +++ b/distros/noetic/mavros-extras/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Extra nodes and plugins for MAVROS.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/noetic/mavros-msgs/default.nix b/distros/noetic/mavros-msgs/default.nix index 205bd0e25b..0764bd8be0 100644 --- a/distros/noetic/mavros-msgs/default.nix +++ b/distros/noetic/mavros-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''mavros_msgs defines messages for MAVROS.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/noetic/mavros/default.nix b/distros/noetic/mavros/default.nix index ec3809b797..73031f3241 100644 --- a/distros/noetic/mavros/default.nix +++ b/distros/noetic/mavros/default.nix @@ -22,6 +22,6 @@ buildRosPackage { meta = { description = ''MAVROS -- MAVLink extendable communication node for ROS with proxy for Ground Control Station.''; - license = with lib.licenses; [ gpl3 lgpl2 bsdOriginal ]; + license = with lib.licenses; [ "GPL-3.0-only" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/noetic/mbf-abstract-core/default.nix b/distros/noetic/mbf-abstract-core/default.nix index 333a8e2282..36f9bc7d62 100644 --- a/distros/noetic/mbf-abstract-core/default.nix +++ b/distros/noetic/mbf-abstract-core/default.nix @@ -19,6 +19,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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mbf-abstract-nav/default.nix b/distros/noetic/mbf-abstract-nav/default.nix index a8b412d931..24fbb04a01 100644 --- a/distros/noetic/mbf-abstract-nav/default.nix +++ b/distros/noetic/mbf-abstract-nav/default.nix @@ -19,6 +19,6 @@ buildRosPackage { 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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mbf-costmap-core/default.nix b/distros/noetic/mbf-costmap-core/default.nix index ea11d51451..86f5fec080 100644 --- a/distros/noetic/mbf-costmap-core/default.nix +++ b/distros/noetic/mbf-costmap-core/default.nix @@ -19,6 +19,6 @@ buildRosPackage { 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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mbf-costmap-nav/default.nix b/distros/noetic/mbf-costmap-nav/default.nix index b066bec8a2..c209116858 100644 --- a/distros/noetic/mbf-costmap-nav/default.nix +++ b/distros/noetic/mbf-costmap-nav/default.nix @@ -21,6 +21,6 @@ buildRosPackage { 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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mbf-mesh-core/default.nix b/distros/noetic/mbf-mesh-core/default.nix index b45cf3d4cb..7c65e1c6f2 100644 --- a/distros/noetic/mbf-mesh-core/default.nix +++ b/distros/noetic/mbf-mesh-core/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mbf_mesh_core package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mbf-mesh-nav/default.nix b/distros/noetic/mbf-mesh-nav/default.nix index 0e05d30ee0..675cd1a7d1 100644 --- a/distros/noetic/mbf-mesh-nav/default.nix +++ b/distros/noetic/mbf-mesh-nav/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mbf_mesh_nav package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mbf-msgs/default.nix b/distros/noetic/mbf-msgs/default.nix index cdbea0d9b4..ebfd0daa5f 100644 --- a/distros/noetic/mbf-msgs/default.nix +++ b/distros/noetic/mbf-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { 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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mbf-simple-nav/default.nix b/distros/noetic/mbf-simple-nav/default.nix index 53430f131e..1017b18baa 100644 --- a/distros/noetic/mbf-simple-nav/default.nix +++ b/distros/noetic/mbf-simple-nav/default.nix @@ -21,6 +21,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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mbf-utility/default.nix b/distros/noetic/mbf-utility/default.nix index 00ba610342..a93ada53f2 100644 --- a/distros/noetic/mbf-utility/default.nix +++ b/distros/noetic/mbf-utility/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mbf_utility package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mesh-client/default.nix b/distros/noetic/mesh-client/default.nix index 400b506b2c..1694d2c1a2 100644 --- a/distros/noetic/mesh-client/default.nix +++ b/distros/noetic/mesh-client/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The mesh_client package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mesh-controller/default.nix b/distros/noetic/mesh-controller/default.nix index 7b79d76d72..b37ec7ffea 100644 --- a/distros/noetic/mesh-controller/default.nix +++ b/distros/noetic/mesh-controller/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mesh_controller package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mesh-layers/default.nix b/distros/noetic/mesh-layers/default.nix index e85b941890..816c99f6c5 100644 --- a/distros/noetic/mesh-layers/default.nix +++ b/distros/noetic/mesh-layers/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mesh_layers package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mesh-map/default.nix b/distros/noetic/mesh-map/default.nix index 3bc5ed8abf..bd7157e384 100644 --- a/distros/noetic/mesh-map/default.nix +++ b/distros/noetic/mesh-map/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mesh_map package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mesh-msgs-conversions/default.nix b/distros/noetic/mesh-msgs-conversions/default.nix index 2171b74360..d6db1e31b1 100644 --- a/distros/noetic/mesh-msgs-conversions/default.nix +++ b/distros/noetic/mesh-msgs-conversions/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''converts point clouds and attributes into meshes and mesh attributes''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mesh-msgs-hdf5/default.nix b/distros/noetic/mesh-msgs-hdf5/default.nix index d3a12570f5..721915d50b 100644 --- a/distros/noetic/mesh-msgs-hdf5/default.nix +++ b/distros/noetic/mesh-msgs-hdf5/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Read mesh_msgs from hdf5''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mesh-msgs-transform/default.nix b/distros/noetic/mesh-msgs-transform/default.nix index ef8f089989..cb1fab5362 100644 --- a/distros/noetic/mesh-msgs-transform/default.nix +++ b/distros/noetic/mesh-msgs-transform/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Methods to transform mesh_msgs''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mesh-msgs/default.nix b/distros/noetic/mesh-msgs/default.nix index e6bf4d8680..de10030194 100644 --- a/distros/noetic/mesh-msgs/default.nix +++ b/distros/noetic/mesh-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Various Message Types for Mesh Data.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mesh-navigation/default.nix b/distros/noetic/mesh-navigation/default.nix index 700fb4bf4c..5ea1ddeb81 100644 --- a/distros/noetic/mesh-navigation/default.nix +++ b/distros/noetic/mesh-navigation/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The mesh_navigation package provides a layered mesh_map implementation, a Move Base Flex mesh navigation server, as well as mesh navigation plugins for path planning and navigation control.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/microstrain-3dmgx2-imu/default.nix b/distros/noetic/microstrain-3dmgx2-imu/default.nix index a0b998ea54..9f83e802c9 100644 --- a/distros/noetic/microstrain-3dmgx2-imu/default.nix +++ b/distros/noetic/microstrain-3dmgx2-imu/default.nix @@ -22,6 +22,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 = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/move-base-flex/default.nix b/distros/noetic/move-base-flex/default.nix index bc00d552f7..a150d6eb6e 100644 --- a/distros/noetic/move-base-flex/default.nix +++ b/distros/noetic/move-base-flex/default.nix @@ -21,6 +21,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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/move-base-sequence/default.nix b/distros/noetic/move-base-sequence/default.nix index 393e5f31d2..616e6509bf 100644 --- a/distros/noetic/move-base-sequence/default.nix +++ b/distros/noetic/move-base-sequence/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The move_base_sequence package''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/moveit-servo/default.nix b/distros/noetic/moveit-servo/default.nix index 1955c3d6a7..a6c3864baa 100644 --- a/distros/noetic/moveit-servo/default.nix +++ b/distros/noetic/moveit-servo/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Provides real-time manipulator Cartesian and joint servoing.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/mpc-local-planner-msgs/default.nix b/distros/noetic/mpc-local-planner-msgs/default.nix index 81a3cd0b8a..0693a783e1 100644 --- a/distros/noetic/mpc-local-planner-msgs/default.nix +++ b/distros/noetic/mpc-local-planner-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package provides message types that are used by the package mpc_local_planner''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/mpc-local-planner/default.nix b/distros/noetic/mpc-local-planner/default.nix index e83752121a..1b2144d08b 100644 --- a/distros/noetic/mpc-local-planner/default.nix +++ b/distros/noetic/mpc-local-planner/default.nix @@ -23,6 +23,6 @@ buildRosPackage { to the base_local_planner of the 2D navigation stack. It provides a generic and versatile model predictive control implementation with minimum-time and quadratic-form receding-horizon configurations.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/nav2d-exploration/default.nix b/distros/noetic/nav2d-exploration/default.nix index 442473112f..345e503fd9 100644 --- a/distros/noetic/nav2d-exploration/default.nix +++ b/distros/noetic/nav2d-exploration/default.nix @@ -20,6 +20,6 @@ buildRosPackage { 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 = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/nav2d-karto/default.nix b/distros/noetic/nav2d-karto/default.nix index ff20375636..fcc6d8ab55 100644 --- a/distros/noetic/nav2d-karto/default.nix +++ b/distros/noetic/nav2d-karto/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Graph-based Simultaneous Localization and Mapping module. Includes OpenKarto GraphSLAM library by "SRI International".''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/nav2d-localizer/default.nix b/distros/noetic/nav2d-localizer/default.nix index 104f0fd319..194b4932d8 100644 --- a/distros/noetic/nav2d-localizer/default.nix +++ b/distros/noetic/nav2d-localizer/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Wrapper around Particle Filter implementation. The SelfLocalizer can be used as library or as a ros-node.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/nav2d-msgs/default.nix b/distros/noetic/nav2d-msgs/default.nix index 616da69acc..c8f017b024 100644 --- a/distros/noetic/nav2d-msgs/default.nix +++ b/distros/noetic/nav2d-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Messages used for 2D-Navigation.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/nav2d-navigator/default.nix b/distros/noetic/nav2d-navigator/default.nix index f22d5ae965..942f59db2a 100644 --- a/distros/noetic/nav2d-navigator/default.nix +++ b/distros/noetic/nav2d-navigator/default.nix @@ -24,6 +24,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 = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/nav2d-operator/default.nix b/distros/noetic/nav2d-operator/default.nix index 4eb9033432..6392e51c1b 100644 --- a/distros/noetic/nav2d-operator/default.nix +++ b/distros/noetic/nav2d-operator/default.nix @@ -24,6 +24,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 = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/nav2d-remote/default.nix b/distros/noetic/nav2d-remote/default.nix index f6eae3c519..d68eedb86f 100644 --- a/distros/noetic/nav2d-remote/default.nix +++ b/distros/noetic/nav2d-remote/default.nix @@ -22,6 +22,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 = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/nav2d-tutorials/default.nix b/distros/noetic/nav2d-tutorials/default.nix index 561b4e5415..47537115bb 100644 --- a/distros/noetic/nav2d-tutorials/default.nix +++ b/distros/noetic/nav2d-tutorials/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Contains a set of tutorials that run 2D-Navigation within Stage-Simulator.''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/nav2d/default.nix b/distros/noetic/nav2d/default.nix index 183dbdca7f..dcf3fcc2ee 100644 --- a/distros/noetic/nav2d/default.nix +++ b/distros/noetic/nav2d/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Meta-Package containing modules for 2D-Navigation''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/navigation/default.nix b/distros/noetic/navigation/default.nix index 556485955c..3201edead6 100644 --- a/distros/noetic/navigation/default.nix +++ b/distros/noetic/navigation/default.nix @@ -21,6 +21,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 = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-LGPL-&-LGPL-amcl-" ]; }; } diff --git a/distros/noetic/octovis/default.nix b/distros/noetic/octovis/default.nix index 317584424a..c911a89a66 100644 --- a/distros/noetic/octovis/default.nix +++ b/distros/noetic/octovis/default.nix @@ -20,6 +20,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 = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/noetic/open-karto/default.nix b/distros/noetic/open-karto/default.nix index 83063d3ec6..15f8e2332f 100644 --- a/distros/noetic/open-karto/default.nix +++ b/distros/noetic/open-karto/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Catkinized ROS packaging of the OpenKarto library''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/openzen-sensor/default.nix b/distros/noetic/openzen-sensor/default.nix index d282b27375..2bd925547b 100644 --- a/distros/noetic/openzen-sensor/default.nix +++ b/distros/noetic/openzen-sensor/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''ROS driver for LP-Research OpenZen''; - license = with lib.licenses; [ mit boost lgpl2 bsdOriginal ]; + license = with lib.licenses; [ mit "BSL-1.0" "LGPL-3.0-only" bsdOriginal ]; }; } diff --git a/distros/noetic/opw-kinematics/default.nix b/distros/noetic/opw-kinematics/default.nix index e759b4bedf..716de7092d 100644 --- a/distros/noetic/opw-kinematics/default.nix +++ b/distros/noetic/opw-kinematics/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, cmake, eigen, gtest, ros-industrial-cmake-boilerplate }: buildRosPackage { pname = "ros-noetic-opw-kinematics"; - version = "0.4.4-r1"; + version = "0.4.5-r1"; src = fetchurl { - url = "https://github.com/ros-industrial-release/opw_kinematics-release/archive/release/noetic/opw_kinematics/0.4.4-1.tar.gz"; - name = "0.4.4-1.tar.gz"; - sha256 = "d5a464c95768f5451b1eb15b2ae44df42d3eec18eaa8cc12f31ddeb36e64c065"; + url = "https://github.com/ros-industrial-release/opw_kinematics-release/archive/release/noetic/opw_kinematics/0.4.5-1.tar.gz"; + name = "0.4.5-1.tar.gz"; + sha256 = "562983049818dbdb37ad49078e881bc6b68c61151a2507cc5bb7728b55f9160d"; }; buildType = "cmake"; diff --git a/distros/noetic/p2os-driver/default.nix b/distros/noetic/p2os-driver/default.nix index f2e6ee5b0b..843ea8ad8a 100644 --- a/distros/noetic/p2os-driver/default.nix +++ b/distros/noetic/p2os-driver/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Driver file descriptions for P2OS/ARCOS robot''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/noetic/paho-mqtt-c/default.nix b/distros/noetic/paho-mqtt-c/default.nix new file mode 100644 index 0000000000..e215764b24 --- /dev/null +++ b/distros/noetic/paho-mqtt-c/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, cmake, openssl }: +buildRosPackage { + pname = "ros-noetic-paho-mqtt-c"; + version = "1.3.9-r1"; + + src = fetchurl { + url = "https://github.com/nobleo/paho.mqtt.c-release/archive/release/noetic/paho-mqtt-c/1.3.9-1.tar.gz"; + name = "1.3.9-1.tar.gz"; + sha256 = "b6e040899f9a5520d8bef21744a8d721c9800c5adb553c1742da104328ef652b"; + }; + + buildType = "cmake"; + propagatedBuildInputs = [ openssl ]; + nativeBuildInputs = [ cmake ]; + + meta = { + description = ''Eclipse Paho C Client Library for the MQTT Protocol''; + license = with lib.licenses; [ "EPL-2.0" ]; + }; +} diff --git a/distros/noetic/paho-mqtt-cpp/default.nix b/distros/noetic/paho-mqtt-cpp/default.nix new file mode 100644 index 0000000000..6146fffdc9 --- /dev/null +++ b/distros/noetic/paho-mqtt-cpp/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, cmake, openssl, paho-mqtt-c }: +buildRosPackage { + pname = "ros-noetic-paho-mqtt-cpp"; + version = "1.2.0-r4"; + + src = fetchurl { + url = "https://github.com/nobleo/paho.mqtt.cpp-release/archive/release/noetic/paho-mqtt-cpp/1.2.0-4.tar.gz"; + name = "1.2.0-4.tar.gz"; + sha256 = "08cfe92bbf29546b435398dc32db9c53974f2d14151d188dc59113aa595af360"; + }; + + buildType = "cmake"; + propagatedBuildInputs = [ openssl paho-mqtt-c ]; + nativeBuildInputs = [ cmake ]; + + meta = { + description = ''Eclipse Paho MQTT C++ Client Library''; + license = with lib.licenses; [ "Eclipse-Public-License-v-1.0" ]; + }; +} diff --git a/distros/noetic/phidgets-drivers/default.nix b/distros/noetic/phidgets-drivers/default.nix index f9a4c6d7d9..b1d8b0cd5a 100644 --- a/distros/noetic/phidgets-drivers/default.nix +++ b/distros/noetic/phidgets-drivers/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''API and ROS drivers for Phidgets devices''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-LGPL" ]; }; } diff --git a/distros/noetic/pilz-robot-programming/default.nix b/distros/noetic/pilz-robot-programming/default.nix index 0be131572e..a5cdd7ddbe 100644 --- a/distros/noetic/pilz-robot-programming/default.nix +++ b/distros/noetic/pilz-robot-programming/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''An Easy to use API to execute standard industrial robot commands like Ptp, Lin, Circ and Sequence using Moveit.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/pinocchio/default.nix b/distros/noetic/pinocchio/default.nix index b7384f1706..54a0869538 100644 --- a/distros/noetic/pinocchio/default.nix +++ b/distros/noetic/pinocchio/default.nix @@ -2,21 +2,21 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, boost, catkin, cmake, doxygen, eigen, eigenpy, git, python3, python3Packages, urdfdom }: +{ lib, buildRosPackage, fetchurl, boost, catkin, clang, cmake, doxygen, eigen, eigenpy, git, hpp-fcl, python3, python3Packages, urdfdom }: buildRosPackage { pname = "ros-noetic-pinocchio"; - version = "2.6.5-r1"; + version = "2.6.6-r2"; src = fetchurl { - url = "https://github.com/stack-of-tasks/pinocchio-ros-release/archive/release/noetic/pinocchio/2.6.5-1.tar.gz"; - name = "2.6.5-1.tar.gz"; - sha256 = "ae04b7e0c795345cd909ad3382f3f9c50b53507a3a0ff71cf9b7572c5bea0a18"; + url = "https://github.com/stack-of-tasks/pinocchio-ros-release/archive/release/noetic/pinocchio/2.6.6-2.tar.gz"; + name = "2.6.6-2.tar.gz"; + sha256 = "12c20b36526d423a8e4c92311b77abe51f8c14b81045b708e2f2ead5de355f46"; }; buildType = "cmake"; buildInputs = [ doxygen git ]; - propagatedBuildInputs = [ boost catkin eigen eigenpy python3 python3Packages.numpy urdfdom ]; - nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ boost catkin eigen eigenpy hpp-fcl python3 python3Packages.numpy urdfdom ]; + nativeBuildInputs = [ clang cmake ]; meta = { description = ''A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives.''; diff --git a/distros/noetic/plotjuggler-msgs/default.nix b/distros/noetic/plotjuggler-msgs/default.nix index 8f5d2396bb..0ee663ac4b 100644 --- a/distros/noetic/plotjuggler-msgs/default.nix +++ b/distros/noetic/plotjuggler-msgs/default.nix @@ -13,7 +13,7 @@ buildRosPackage { sha256 = "2af067089b7ea6584191410dd4bf8eda374b2d67fbc75f57e42b7581ff4928b9"; }; - buildType = "ament_cmake"; + buildType = "catkin"; propagatedBuildInputs = [ message-generation message-runtime std-msgs ]; nativeBuildInputs = [ catkin ]; diff --git a/distros/noetic/plotjuggler-ros/default.nix b/distros/noetic/plotjuggler-ros/default.nix index 41710b6db6..0c1d532af3 100644 --- a/distros/noetic/plotjuggler-ros/default.nix +++ b/distros/noetic/plotjuggler-ros/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''PlotJuggler plugin for ROS''; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ "AGPLv3" ]; }; } diff --git a/distros/noetic/plotjuggler/default.nix b/distros/noetic/plotjuggler/default.nix index b81c54f053..48db7a3a98 100644 --- a/distros/noetic/plotjuggler/default.nix +++ b/distros/noetic/plotjuggler/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''PlotJuggler: juggle with data''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/polar-scan-matcher/default.nix b/distros/noetic/polar-scan-matcher/default.nix index c196d59c56..5864575a19 100644 --- a/distros/noetic/polar-scan-matcher/default.nix +++ b/distros/noetic/polar-scan-matcher/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''

A wrapper around Polar Scan Matcher by Albert Diosi and Lindsay Kleeman, used for laser scan registration.

''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/pr2-ethercat-drivers/default.nix b/distros/noetic/pr2-ethercat-drivers/default.nix index c5f5861180..af92c6b865 100644 --- a/distros/noetic/pr2-ethercat-drivers/default.nix +++ b/distros/noetic/pr2-ethercat-drivers/default.nix @@ -21,6 +21,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 = with lib.licenses; [ bsdOriginal gpl1 ]; + license = with lib.licenses; [ bsdOriginal "GPL" ]; }; } diff --git a/distros/noetic/pr2-self-test/default.nix b/distros/noetic/pr2-self-test/default.nix index 11dc5af0d4..008e7410dc 100644 --- a/distros/noetic/pr2-self-test/default.nix +++ b/distros/noetic/pr2-self-test/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The pr2_self_test package''; - license = with lib.licenses; [ "TODO" ]; + license = with lib.licenses; [ "TODO-CATKIN-PACKAGE-LICENSE" ]; }; } diff --git a/distros/noetic/pr2-teleop/default.nix b/distros/noetic/pr2-teleop/default.nix index 97660e532f..a5d5f6037a 100644 --- a/distros/noetic/pr2-teleop/default.nix +++ b/distros/noetic/pr2-teleop/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The pr2_teleop package''; - license = with lib.licenses; [ "TODO" ]; + license = with lib.licenses; [ "TODO-CATKIN-PACKAGE-LICENSE" ]; }; } diff --git a/distros/noetic/prbt-hardware-support/default.nix b/distros/noetic/prbt-hardware-support/default.nix index 510de5a6a6..2719485c1c 100644 --- a/distros/noetic/prbt-hardware-support/default.nix +++ b/distros/noetic/prbt-hardware-support/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''Control hardware functions of the PRBT manipulator like RUN_PERMITTED for Stop1 functionality.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/psen-scan-v2/default.nix b/distros/noetic/psen-scan-v2/default.nix index 6ad4d47888..004f5ac74a 100644 --- a/distros/noetic/psen-scan-v2/default.nix +++ b/distros/noetic/psen-scan-v2/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''ROS support for the Pilz laser scanner''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/qb-chain-control/default.nix b/distros/noetic/qb-chain-control/default.nix index 14496368df..1881f2ec41 100644 --- a/distros/noetic/qb-chain-control/default.nix +++ b/distros/noetic/qb-chain-control/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS node to control multiple qbrobotics® devices simultaneously.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/qb-chain-controllers/default.nix b/distros/noetic/qb-chain-controllers/default.nix index 4b94ce8ce2..6d548b2603 100644 --- a/distros/noetic/qb-chain-controllers/default.nix +++ b/distros/noetic/qb-chain-controllers/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains the specific controllers for qbrobotics® kinematic structures, e.g. the qbdelta controller.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/qb-chain-description/default.nix b/distros/noetic/qb-chain-description/default.nix index dda80c165d..8af2a7ee3c 100644 --- a/distros/noetic/qb-chain-description/default.nix +++ b/distros/noetic/qb-chain-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS description for complex chains of qbrobotics® devices.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/qb-chain-msgs/default.nix b/distros/noetic/qb-chain-msgs/default.nix index b11a991b37..1ba881810b 100644 --- a/distros/noetic/qb-chain-msgs/default.nix +++ b/distros/noetic/qb-chain-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''message to control end-effector pose, robot sitiffness and velocity''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/qb-chain/default.nix b/distros/noetic/qb-chain/default.nix index 80f142f4f4..013eb9c983 100644 --- a/distros/noetic/qb-chain/default.nix +++ b/distros/noetic/qb-chain/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS interface to control multiple qbrobotics® devices simultaneously.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/qb-hand-control/default.nix b/distros/noetic/qb-hand-control/default.nix index 08554fd580..d4b80c9f39 100644 --- a/distros/noetic/qb-hand-control/default.nix +++ b/distros/noetic/qb-hand-control/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS control node for qbrobotics® qbhand device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/qb-hand-description/default.nix b/distros/noetic/qb-hand-description/default.nix index a0ff61cf3b..6ff4a559b6 100644 --- a/distros/noetic/qb-hand-description/default.nix +++ b/distros/noetic/qb-hand-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS description for qbrobotics® qbhand device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/qb-hand/default.nix b/distros/noetic/qb-hand/default.nix index 02bf2e7941..5e4788e810 100644 --- a/distros/noetic/qb-hand/default.nix +++ b/distros/noetic/qb-hand/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS interface for qbrobotics® qbhand device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/qb-move-control/default.nix b/distros/noetic/qb-move-control/default.nix index 0ce0eb024a..42854dfd79 100644 --- a/distros/noetic/qb-move-control/default.nix +++ b/distros/noetic/qb-move-control/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS control node for qbrobotics® qbmove device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/qb-move-description/default.nix b/distros/noetic/qb-move-description/default.nix index c60f2516bf..b42e4c14f8 100644 --- a/distros/noetic/qb-move-description/default.nix +++ b/distros/noetic/qb-move-description/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS description for qbrobotics® qbmove device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/qb-move/default.nix b/distros/noetic/qb-move/default.nix index 4cef0df616..77bb86d0ff 100644 --- a/distros/noetic/qb-move/default.nix +++ b/distros/noetic/qb-move/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package contains the ROS interface for qbrobotics® qbmove device.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/qpoases-vendor/default.nix b/distros/noetic/qpoases-vendor/default.nix index 694ba550de..4c2bfd66b1 100644 --- a/distros/noetic/qpoases-vendor/default.nix +++ b/distros/noetic/qpoases-vendor/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Wrapper around qpOASES to make it available to the ROS ecosystem.''; - license = with lib.licenses; [ asl20 lgpl2 ]; + license = with lib.licenses; [ asl20 "LGPL" ]; }; } diff --git a/distros/noetic/razor-imu-9dof/default.nix b/distros/noetic/razor-imu-9dof/default.nix index 65264e3f12..abe7cbea6f 100644 --- a/distros/noetic/razor-imu-9dof/default.nix +++ b/distros/noetic/razor-imu-9dof/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''razor_imu_9dof is a package that provides a ROS driver for the Sparkfun OpenLog Artemis, 9DoF Razor IMU M0, 9DOF Razor IMU and 9DOF Sensor Stick. It also provides Arduino firmware that runs on the board, and which must be installed on it for the system to work. A node which displays the attitude (roll, pitch and yaw) of the board (or any IMU) is provided for testing.''; - license = with lib.licenses; [ bsdOriginal gpl3 ]; + license = with lib.licenses; [ bsdOriginal "GPL-3.0-only" ]; }; } diff --git a/distros/noetic/robotraconteur/default.nix b/distros/noetic/robotraconteur/default.nix index e97b46d74f..6dabbf2797 100644 --- a/distros/noetic/robotraconteur/default.nix +++ b/distros/noetic/robotraconteur/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, bluez, boost, catkin, dbus, libusb1, openssl, python3, python3Packages, zlib }: buildRosPackage { pname = "ros-noetic-robotraconteur"; - version = "0.15.4-r1"; + version = "0.15.5-r1"; src = fetchurl { - url = "https://github.com/robotraconteur-packaging/robotraconteur-ros-release/archive/release/noetic/robotraconteur/0.15.4-1.tar.gz"; - name = "0.15.4-1.tar.gz"; - sha256 = "82a221b2e1b37291f02de6bd3962f0190de41f7de2f106bd953ce4fb3e58bfd1"; + url = "https://github.com/robotraconteur-packaging/robotraconteur-ros-release/archive/release/noetic/robotraconteur/0.15.5-1.tar.gz"; + name = "0.15.5-1.tar.gz"; + sha256 = "db9915e61c7d083039943fbab37e24d53709b8237ac97f026b55b3e4ce84a30d"; }; buildType = "cmake"; diff --git a/distros/noetic/rokubimini-bus-manager/default.nix b/distros/noetic/rokubimini-bus-manager/default.nix index 53ebfddf14..d5487dfd41 100644 --- a/distros/noetic/rokubimini-bus-manager/default.nix +++ b/distros/noetic/rokubimini-bus-manager/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r2"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/rokubimini_bus_manager/0.6.1-2/bota_driver-release-release-noetic-rokubimini_bus_manager-0.6.1-2.tar.gz"; - name = "bota_driver-release-release-noetic-rokubimini_bus_manager-0.6.1-2.tar.gz"; - sha256 = "14d90b2200315a19356acaaaa3af332783e845b93c41e9d7dd02ff8c4d45c02b"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/rokubimini_bus_manager/0.6.1-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "8022fd076c64045191310d5a37f1f25e8925aa210c635d6e20b36a77d1dcf34f"; }; buildType = "catkin"; diff --git a/distros/noetic/rokubimini-description/default.nix b/distros/noetic/rokubimini-description/default.nix index 1db1c3a141..6d0627c90d 100644 --- a/distros/noetic/rokubimini-description/default.nix +++ b/distros/noetic/rokubimini-description/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r2"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/rokubimini_description/0.6.1-2/bota_driver-release-release-noetic-rokubimini_description-0.6.1-2.tar.gz"; - name = "bota_driver-release-release-noetic-rokubimini_description-0.6.1-2.tar.gz"; - sha256 = "dd660bfd5bad54b0c7c76a041109fc63b3709c3490db1884b04e1d80ee6bf042"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/rokubimini_description/0.6.1-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "080320618e1d3c340315f44a036b4b4f7aeb22ece7afc883430749e7c3105597"; }; buildType = "catkin"; diff --git a/distros/noetic/rokubimini-ethercat/default.nix b/distros/noetic/rokubimini-ethercat/default.nix index 47c3870eab..0b4767d4de 100644 --- a/distros/noetic/rokubimini-ethercat/default.nix +++ b/distros/noetic/rokubimini-ethercat/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r2"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/rokubimini_ethercat/0.6.1-2/bota_driver-release-release-noetic-rokubimini_ethercat-0.6.1-2.tar.gz"; - name = "bota_driver-release-release-noetic-rokubimini_ethercat-0.6.1-2.tar.gz"; - sha256 = "f45d85861851179df943fb6dd0908004d15513782b1b8aaa51fcc35b7f188124"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/rokubimini_ethercat/0.6.1-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "1163e84b17992905cbcdf7ea4027d55e1bac0987722ac1b5412eb9c08c50b214"; }; buildType = "catkin"; diff --git a/distros/noetic/rokubimini-msgs/default.nix b/distros/noetic/rokubimini-msgs/default.nix index 12069ee969..9c526808e0 100644 --- a/distros/noetic/rokubimini-msgs/default.nix +++ b/distros/noetic/rokubimini-msgs/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r2"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/rokubimini_msgs/0.6.1-2/bota_driver-release-release-noetic-rokubimini_msgs-0.6.1-2.tar.gz"; - name = "bota_driver-release-release-noetic-rokubimini_msgs-0.6.1-2.tar.gz"; - sha256 = "c8910a1731b77ae3022d2d5fa117f5240b704094427c0d72e5a3921edd480b81"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/rokubimini_msgs/0.6.1-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "d11aef0ab0025d06a8b2d5302585adf0accd757481c503aa3883c0487d81966f"; }; buildType = "catkin"; diff --git a/distros/noetic/rokubimini-serial/default.nix b/distros/noetic/rokubimini-serial/default.nix index 1dc7be679e..83030bfc3d 100644 --- a/distros/noetic/rokubimini-serial/default.nix +++ b/distros/noetic/rokubimini-serial/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r2"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/rokubimini_serial/0.6.1-2/bota_driver-release-release-noetic-rokubimini_serial-0.6.1-2.tar.gz"; - name = "bota_driver-release-release-noetic-rokubimini_serial-0.6.1-2.tar.gz"; - sha256 = "4e4dcc7306c6f3e9e302009d1533eeb9d62bb85419f2af604c2f1fab95c4aca5"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/rokubimini_serial/0.6.1-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "0b375686ca86b95bef3c776dece65521adaed128432ea3377614aa9713435eec"; }; buildType = "catkin"; diff --git a/distros/noetic/rokubimini/default.nix b/distros/noetic/rokubimini/default.nix index 89414f57ed..e224f8bb06 100644 --- a/distros/noetic/rokubimini/default.nix +++ b/distros/noetic/rokubimini/default.nix @@ -8,9 +8,9 @@ buildRosPackage { version = "0.6.1-r2"; src = fetchurl { - url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/rokubimini/0.6.1-2/bota_driver-release-release-noetic-rokubimini-0.6.1-2.tar.gz"; - name = "bota_driver-release-release-noetic-rokubimini-0.6.1-2.tar.gz"; - sha256 = "3fe0e1c467cb038b1a6294e5326c831797396b4cc1ccb2fe5b5db2540e9e8dd3"; + url = "https://gitlab.com/botasys/bota_driver-release/-/archive/release/noetic/rokubimini/0.6.1-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "bc1d4686d9562b6db34f6b84872a72e0254c32990e8887ca5ae15bce999fb745"; }; buildType = "catkin"; diff --git a/distros/noetic/ros-canopen/default.nix b/distros/noetic/ros-canopen/default.nix index 14f855e38b..8a72d45b93 100644 --- a/distros/noetic/ros-canopen/default.nix +++ b/distros/noetic/ros-canopen/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''A generic canopen implementation for ROS''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/ros-industrial-cmake-boilerplate/default.nix b/distros/noetic/ros-industrial-cmake-boilerplate/default.nix index e0b3109702..2c4290f790 100644 --- a/distros/noetic/ros-industrial-cmake-boilerplate/default.nix +++ b/distros/noetic/ros-industrial-cmake-boilerplate/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Contains boilerplate cmake script, macros and utils''; - license = with lib.licenses; [ asl20 bsdOriginal ]; + license = with lib.licenses; [ asl20 "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/ros-realtime/default.nix b/distros/noetic/ros-realtime/default.nix index 2b36312786..54da41592f 100644 --- a/distros/noetic/ros-realtime/default.nix +++ b/distros/noetic/ros-realtime/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The ros_realtime package''; - license = with lib.licenses; [ "TODO" ]; + license = with lib.licenses; [ "TODO-CATKIN-PACKAGE-LICENSE" ]; }; } diff --git a/distros/noetic/rosatomic/default.nix b/distros/noetic/rosatomic/default.nix index 1865aecad8..ff1a046c85 100644 --- a/distros/noetic/rosatomic/default.nix +++ b/distros/noetic/rosatomic/default.nix @@ -20,6 +20,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 = with lib.licenses; [ bsdOriginal boost ]; + license = with lib.licenses; [ bsdOriginal "BSL-1.0" ]; }; } diff --git a/distros/noetic/rosee-msg/default.nix b/distros/noetic/rosee-msg/default.nix new file mode 100644 index 0000000000..0efcd24ec0 --- /dev/null +++ b/distros/noetic/rosee-msg/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, actionlib-msgs, catkin, geometry-msgs, message-generation, message-runtime, roscpp, rospy, std-msgs, std-srvs }: +buildRosPackage { + pname = "ros-noetic-rosee-msg"; + version = "1.0.2-r2"; + + src = fetchurl { + url = "https://github.com/ADVRHumanoids/rosee_msg-release/archive/release/noetic/rosee_msg/1.0.2-2.tar.gz"; + name = "1.0.2-2.tar.gz"; + sha256 = "e0eda55eb27e429b6473555f2c3b714a58533e6885dbe982da26bfa342ad6818"; + }; + + buildType = "catkin"; + buildInputs = [ geometry-msgs std-msgs std-srvs ]; + propagatedBuildInputs = [ actionlib-msgs message-generation message-runtime roscpp rospy ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''The rosee_msg package''; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/distros/noetic/roslisp-repl/default.nix b/distros/noetic/roslisp-repl/default.nix index 41aeb3e872..1b69f213c6 100644 --- a/distros/noetic/roslisp-repl/default.nix +++ b/distros/noetic/roslisp-repl/default.nix @@ -21,6 +21,6 @@ buildRosPackage { description = ''This package provides a script that launches Emacs with Slime (the Superior Lisp Interaction Mode) ready for Lisp development and roslisp.''; - license = with lib.licenses; [ publicDomain ]; + license = with lib.licenses; [ "PD" ]; }; } diff --git a/distros/noetic/rosping/default.nix b/distros/noetic/rosping/default.nix index d93eec48d8..1ee29a705e 100644 --- a/distros/noetic/rosping/default.nix +++ b/distros/noetic/rosping/default.nix @@ -21,6 +21,6 @@ buildRosPackage { 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 = with lib.licenses; [ boost ]; + license = with lib.licenses; [ "BSL-1.0" ]; }; } diff --git a/distros/noetic/rostwitter/default.nix b/distros/noetic/rostwitter/default.nix index 97b885e63e..6bb71272e4 100644 --- a/distros/noetic/rostwitter/default.nix +++ b/distros/noetic/rostwitter/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The rostwitter package''; - license = with lib.licenses; [ "Apache-1.0" ]; + license = with lib.licenses; [ "Apache" ]; }; } diff --git a/distros/noetic/rqt-gui-cpp/default.nix b/distros/noetic/rqt-gui-cpp/default.nix index efbbcf3190..23c00a6acf 100644 --- a/distros/noetic/rqt-gui-cpp/default.nix +++ b/distros/noetic/rqt-gui-cpp/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, nodelet, qt-gui, qt-gui-cpp, qt5, roscpp }: buildRosPackage { pname = "ros-noetic-rqt-gui-cpp"; - version = "0.5.2-r1"; + version = "0.5.3-r1"; src = fetchurl { - url = "https://github.com/ros-gbp/rqt-release/archive/release/noetic/rqt_gui_cpp/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "d0958fbb96bdfc3dcd19d7ee86bed772f2b66a351a916c272d5a80cbd3935dc9"; + url = "https://github.com/ros-gbp/rqt-release/archive/release/noetic/rqt_gui_cpp/0.5.3-1.tar.gz"; + name = "0.5.3-1.tar.gz"; + sha256 = "1b87265e422398938561fb938fc66f820ff63f28f5c8da4b198410b3eeb2f5cf"; }; buildType = "catkin"; diff --git a/distros/noetic/rqt-gui-py/default.nix b/distros/noetic/rqt-gui-py/default.nix index ea366a93de..e7d5957d1f 100644 --- a/distros/noetic/rqt-gui-py/default.nix +++ b/distros/noetic/rqt-gui-py/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, qt-gui, rospy, rqt-gui }: buildRosPackage { pname = "ros-noetic-rqt-gui-py"; - version = "0.5.2-r1"; + version = "0.5.3-r1"; src = fetchurl { - url = "https://github.com/ros-gbp/rqt-release/archive/release/noetic/rqt_gui_py/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "09189797f0eb056a7b9b22dfdd77b25b66a170e83173ad798f1a9d2e8b777888"; + url = "https://github.com/ros-gbp/rqt-release/archive/release/noetic/rqt_gui_py/0.5.3-1.tar.gz"; + name = "0.5.3-1.tar.gz"; + sha256 = "3a72b9cf0c411dabdeab3f8299e64d7926eb1e8f51403f1019acd8b0bf9f9b27"; }; buildType = "catkin"; diff --git a/distros/noetic/rqt-gui/default.nix b/distros/noetic/rqt-gui/default.nix index 47ff28111c..520dc0e2f3 100644 --- a/distros/noetic/rqt-gui/default.nix +++ b/distros/noetic/rqt-gui/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, qt-gui, rospy }: buildRosPackage { pname = "ros-noetic-rqt-gui"; - version = "0.5.2-r1"; + version = "0.5.3-r1"; src = fetchurl { - url = "https://github.com/ros-gbp/rqt-release/archive/release/noetic/rqt_gui/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "a4ca503112f96154465456c8f816b517eee69606417c48325dffd5edfb1c3399"; + url = "https://github.com/ros-gbp/rqt-release/archive/release/noetic/rqt_gui/0.5.3-1.tar.gz"; + name = "0.5.3-1.tar.gz"; + sha256 = "aa55a946456a86035c97ea159bd9c71d8a410e8e069fc3df1cd585649b78308d"; }; buildType = "catkin"; diff --git a/distros/noetic/rqt-multiplot/default.nix b/distros/noetic/rqt-multiplot/default.nix index 57cc153f47..89d9bde1d8 100644 --- a/distros/noetic/rqt-multiplot/default.nix +++ b/distros/noetic/rqt-multiplot/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''rqt_multiplot provides a GUI plugin for visualizing numeric values in multiple 2D plots using the Qwt plotting backend.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "GNU-Lesser-General-Public-License-LGPL-" ]; }; } diff --git a/distros/noetic/rqt-py-common/default.nix b/distros/noetic/rqt-py-common/default.nix index 0ad75dd5b7..8b353432cc 100644 --- a/distros/noetic/rqt-py-common/default.nix +++ b/distros/noetic/rqt-py-common/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, actionlib, catkin, genmsg, genpy, python-qt-binding, qt-gui, rosbag, roslib, rospy, rostopic, std-msgs }: buildRosPackage { pname = "ros-noetic-rqt-py-common"; - version = "0.5.2-r1"; + version = "0.5.3-r1"; src = fetchurl { - url = "https://github.com/ros-gbp/rqt-release/archive/release/noetic/rqt_py_common/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "043ee2a271fe913b2dac1c47db5c032ce7690ee8786553df7fd9767da63b688a"; + url = "https://github.com/ros-gbp/rqt-release/archive/release/noetic/rqt_py_common/0.5.3-1.tar.gz"; + name = "0.5.3-1.tar.gz"; + sha256 = "021bd4579dd2ebf73b589a08345ba476ec96bc042466d345e41f760ca6eae06a"; }; buildType = "catkin"; diff --git a/distros/noetic/rqt-robot-monitor/default.nix b/distros/noetic/rqt-robot-monitor/default.nix index 931a1d368b..5100e2152a 100644 --- a/distros/noetic/rqt-robot-monitor/default.nix +++ b/distros/noetic/rqt-robot-monitor/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, diagnostic-msgs, python-qt-binding, python3Packages, qt-gui, qt-gui-py-common, rospy, rqt-bag, rqt-gui, rqt-gui-py, rqt-py-common }: buildRosPackage { pname = "ros-noetic-rqt-robot-monitor"; - version = "0.5.13-r1"; + version = "0.5.14-r1"; src = fetchurl { - url = "https://github.com/ros-gbp/rqt_robot_monitor-release/archive/release/noetic/rqt_robot_monitor/0.5.13-1.tar.gz"; - name = "0.5.13-1.tar.gz"; - sha256 = "c7964d5357cd0acf01ffbe302e805a70afb5c0619dfbb2fedf1d19d981e47590"; + url = "https://github.com/ros-gbp/rqt_robot_monitor-release/archive/release/noetic/rqt_robot_monitor/0.5.14-1.tar.gz"; + name = "0.5.14-1.tar.gz"; + sha256 = "2b6ea56c5b17fae4955f5ea8061adc9991715efe202a8dcb347442aad4bab6b8"; }; buildType = "catkin"; diff --git a/distros/noetic/rqt/default.nix b/distros/noetic/rqt/default.nix index b958d17c98..1622e78e34 100644 --- a/distros/noetic/rqt/default.nix +++ b/distros/noetic/rqt/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, rqt-gui, rqt-gui-cpp, rqt-gui-py }: buildRosPackage { pname = "ros-noetic-rqt"; - version = "0.5.2-r1"; + version = "0.5.3-r1"; src = fetchurl { - url = "https://github.com/ros-gbp/rqt-release/archive/release/noetic/rqt/0.5.2-1.tar.gz"; - name = "0.5.2-1.tar.gz"; - sha256 = "cc3a65455d69569b599ab5c138d38787dd28ba8b2484b65d1be20f294e365580"; + url = "https://github.com/ros-gbp/rqt-release/archive/release/noetic/rqt/0.5.3-1.tar.gz"; + name = "0.5.3-1.tar.gz"; + sha256 = "59d56c82e343c8dd90174fe2318b1c7245f76807c6d594cb834df9be769b44f0"; }; buildType = "catkin"; diff --git a/distros/noetic/rslidar-sdk/default.nix b/distros/noetic/rslidar-sdk/default.nix index 8c69f6ddad..241cf91231 100644 --- a/distros/noetic/rslidar-sdk/default.nix +++ b/distros/noetic/rslidar-sdk/default.nix @@ -5,15 +5,15 @@ { lib, buildRosPackage, fetchurl, catkin, libpcap, libyamlcpp, pcl, pcl-conversions, pcl-ros, roscpp, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-noetic-rslidar-sdk"; - version = "1.3.0-r4"; + version = "1.3.2-r1"; src = fetchurl { - url = "https://github.com/nobleo/rslidar_sdk-release/archive/release/noetic/rslidar_sdk/1.3.0-4.tar.gz"; - name = "1.3.0-4.tar.gz"; - sha256 = "f19e7aff675714176889e6f190bfae965f5c047d84a25b8d20f64e445dea616b"; + url = "https://github.com/nobleo/rslidar_sdk-release/archive/release/noetic/rslidar_sdk/1.3.2-1.tar.gz"; + name = "1.3.2-1.tar.gz"; + sha256 = "a3612756dc300bd8ee422b1d99dc46bc317814c568d5491fc987c72ce65f8d09"; }; - buildType = "ament_cmake"; + buildType = "catkin"; propagatedBuildInputs = [ libpcap libyamlcpp pcl pcl-conversions pcl-ros roscpp sensor-msgs std-msgs ]; nativeBuildInputs = [ catkin ]; diff --git a/distros/noetic/rviz/default.nix b/distros/noetic/rviz/default.nix index e8e3a99c0b..da8f785237 100644 --- a/distros/noetic/rviz/default.nix +++ b/distros/noetic/rviz/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''3D visualization tool for ROS.''; - license = with lib.licenses; [ bsdOriginal "CC-BY-SA-3.0" ]; + license = with lib.licenses; [ bsdOriginal "Creative-Commons" ]; }; } diff --git a/distros/noetic/scaled-joint-trajectory-controller/default.nix b/distros/noetic/scaled-joint-trajectory-controller/default.nix index 63903efd08..241a548259 100644 --- a/distros/noetic/scaled-joint-trajectory-controller/default.nix +++ b/distros/noetic/scaled-joint-trajectory-controller/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Provides controllers that use the speed scaling interface.''; - license = with lib.licenses; [ asl20 bsdOriginal ]; + license = with lib.licenses; [ asl20 "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/scan-tools/default.nix b/distros/noetic/scan-tools/default.nix index 757eb0a975..aea6f25eec 100644 --- a/distros/noetic/scan-tools/default.nix +++ b/distros/noetic/scan-tools/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Laser scan processing tools.''; - license = with lib.licenses; [ bsdOriginal lgpl2 ]; + license = with lib.licenses; [ bsdOriginal "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/scenario-test-tools/default.nix b/distros/noetic/scenario-test-tools/default.nix index 4f6bc96dd6..8f5fadebaf 100644 --- a/distros/noetic/scenario-test-tools/default.nix +++ b/distros/noetic/scenario-test-tools/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, actionlib, catkin, cob-sound, cob-srvs, control-msgs, geometry-msgs, move-base-msgs, python3Packages, rospy, std-msgs, std-srvs, tf }: buildRosPackage { pname = "ros-noetic-scenario-test-tools"; - version = "0.6.27-r1"; + version = "0.6.28-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/scenario_test_tools/0.6.27-1.tar.gz"; - name = "0.6.27-1.tar.gz"; - sha256 = "bf34e45b25fb90b29dec0b4deef92f186c47ab47f08ac4b7633975df383528d7"; + url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/scenario_test_tools/0.6.28-1.tar.gz"; + name = "0.6.28-1.tar.gz"; + sha256 = "0f39ed997daa9de1ad0a07509a0af60843ad019ba4b02cb16d98e08411a5c85c"; }; buildType = "catkin"; diff --git a/distros/noetic/septentrio-gnss-driver/default.nix b/distros/noetic/septentrio-gnss-driver/default.nix index ec3b439640..209f315074 100644 --- a/distros/noetic/septentrio-gnss-driver/default.nix +++ b/distros/noetic/septentrio-gnss-driver/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''ROSaic: C++ driver for Septentrio's mosaic receivers and beyond''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause-License" ]; }; } diff --git a/distros/noetic/service-tools/default.nix b/distros/noetic/service-tools/default.nix index cc2c8905cd..70defc1de3 100644 --- a/distros/noetic/service-tools/default.nix +++ b/distros/noetic/service-tools/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, rospy, rosservice }: buildRosPackage { pname = "ros-noetic-service-tools"; - version = "0.6.27-r1"; + version = "0.6.28-r1"; src = fetchurl { - url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/service_tools/0.6.27-1.tar.gz"; - name = "0.6.27-1.tar.gz"; - sha256 = "0b5656268cf34ce45f8512dbf2f1360ea6f6a980c57fe96f188ea51f34d4c61b"; + url = "https://github.com/ipa320/cob_command_tools-release/archive/release/noetic/service_tools/0.6.28-1.tar.gz"; + name = "0.6.28-1.tar.gz"; + sha256 = "d2034fc00f35f266c74c3c1f33d379f83be2496a1741c46851b535d84c17c905"; }; buildType = "catkin"; diff --git a/distros/noetic/slam-karto/default.nix b/distros/noetic/slam-karto/default.nix index aa82cbb908..81ef49703d 100644 --- a/distros/noetic/slam-karto/default.nix +++ b/distros/noetic/slam-karto/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''This package pulls in the Karto mapping library, and provides a ROS wrapper for using it.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/slam-toolbox-msgs/default.nix b/distros/noetic/slam-toolbox-msgs/default.nix index 3cad2cb9ce..e6aaafe401 100644 --- a/distros/noetic/slam-toolbox-msgs/default.nix +++ b/distros/noetic/slam-toolbox-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''This package provides a sped up improved slam karto with updated SDK and visualization and modification toolsets''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/slam-toolbox-rviz/default.nix b/distros/noetic/slam-toolbox-rviz/default.nix index 5d5a320df8..c52253f8f5 100644 --- a/distros/noetic/slam-toolbox-rviz/default.nix +++ b/distros/noetic/slam-toolbox-rviz/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This package provides a sped up improved slam karto with updated SDK and visualization and modification toolsets''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/slam-toolbox/default.nix b/distros/noetic/slam-toolbox/default.nix index b6f837bc02..2fa4bc6997 100644 --- a/distros/noetic/slam-toolbox/default.nix +++ b/distros/noetic/slam-toolbox/default.nix @@ -21,6 +21,6 @@ buildRosPackage { meta = { description = ''This package provides a sped up improved slam karto with updated SDK and visualization and modification toolsets''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL" ]; }; } diff --git a/distros/noetic/slic/default.nix b/distros/noetic/slic/default.nix index dd770f667e..a82cff5212 100644 --- a/distros/noetic/slic/default.nix +++ b/distros/noetic/slic/default.nix @@ -26,6 +26,6 @@ buildRosPackage { This implementation is created for the specific purpose of creating over-segmentations in an OpenCV-based environment.''; - license = with lib.licenses; [ "N/A" ]; + license = with lib.licenses; [ "N-A" ]; }; } diff --git a/distros/noetic/slime-ros/default.nix b/distros/noetic/slime-ros/default.nix index f91f1662b4..fec1e80bf1 100644 --- a/distros/noetic/slime-ros/default.nix +++ b/distros/noetic/slime-ros/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Extensions for slime to assist in working with ROS packages''; - license = with lib.licenses; [ publicDomain ]; + license = with lib.licenses; [ "PD" ]; }; } diff --git a/distros/noetic/slime-wrapper/default.nix b/distros/noetic/slime-wrapper/default.nix index 2fe361c454..ac9abb17dd 100644 --- a/distros/noetic/slime-wrapper/default.nix +++ b/distros/noetic/slime-wrapper/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''ROS wrapper for slime''; - license = with lib.licenses; [ publicDomain ]; + license = with lib.licenses; [ "PD" ]; }; } diff --git a/distros/noetic/socketcan-interface/default.nix b/distros/noetic/socketcan-interface/default.nix index 546d63bc01..b4c32141a7 100644 --- a/distros/noetic/socketcan-interface/default.nix +++ b/distros/noetic/socketcan-interface/default.nix @@ -20,6 +20,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 = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/soem/default.nix b/distros/noetic/soem/default.nix index 220fff6fa5..1aa0040c7e 100644 --- a/distros/noetic/soem/default.nix +++ b/distros/noetic/soem/default.nix @@ -20,6 +20,6 @@ buildRosPackage { description = ''ROS wrapper for the Simple Open EtherCAT Master SOEM. This is an updated version of the original SOEM wrapper released into ROS now including the upstream Repo as a git subtree.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPLv2-with-linking-exception" ]; }; } diff --git a/distros/noetic/spatio-temporal-voxel-layer/default.nix b/distros/noetic/spatio-temporal-voxel-layer/default.nix index 5706c6074f..c08f25f2e6 100644 --- a/distros/noetic/spatio-temporal-voxel-layer/default.nix +++ b/distros/noetic/spatio-temporal-voxel-layer/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The spatio-temporal 3D obstacle costmap package''; - license = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-only" ]; }; } diff --git a/distros/noetic/spinnaker-camera-driver/default.nix b/distros/noetic/spinnaker-camera-driver/default.nix new file mode 100644 index 0000000000..762e1842b0 --- /dev/null +++ b/distros/noetic/spinnaker-camera-driver/default.nix @@ -0,0 +1,26 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, camera-info-manager, catkin, curl, diagnostic-updater, dpkg, dynamic-reconfigure, image-exposure-msgs, image-proc, image-transport, libusb1, nodelet, roscpp, roslaunch, roslint, sensor-msgs, wfov-camera-msgs }: +buildRosPackage { + pname = "ros-noetic-spinnaker-camera-driver"; + version = "0.2.1-r1"; + + src = fetchurl { + url = "https://github.com/ros-drivers-gbp/flir_camera_driver-release/archive/release/noetic/spinnaker_camera_driver/0.2.1-1.tar.gz"; + name = "0.2.1-1.tar.gz"; + sha256 = "5dec1b14ea0bd0846d2140656b5a3f00576970a509761f8edb26547f77854e34"; + }; + + buildType = "catkin"; + buildInputs = [ curl dpkg ]; + checkInputs = [ roslaunch roslint ]; + propagatedBuildInputs = [ camera-info-manager diagnostic-updater dynamic-reconfigure image-exposure-msgs image-proc image-transport libusb1 nodelet roscpp sensor-msgs wfov-camera-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Spinnaker camera driver based on Spinnaker.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/noetic/sr-hand-detector/default.nix b/distros/noetic/sr-hand-detector/default.nix index 8d48fa251c..56f7c5221e 100644 --- a/distros/noetic/sr-hand-detector/default.nix +++ b/distros/noetic/sr-hand-detector/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''The sr_hand_detector package''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/stage/default.nix b/distros/noetic/stage/default.nix index 4fbc69ae9a..e8accd5001 100644 --- a/distros/noetic/stage/default.nix +++ b/distros/noetic/stage/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Mobile robot simulator http://rtv.github.com/Stage''; - license = with lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ "GPL" ]; }; } diff --git a/distros/noetic/steering-functions/default.nix b/distros/noetic/steering-functions/default.nix index 829185ff86..dafe3c0941 100644 --- a/distros/noetic/steering-functions/default.nix +++ b/distros/noetic/steering-functions/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, catkin, cmake-modules, costmap-2d, eigen, geometry-msgs, nav-msgs, roscpp, roslib, tf, visualization-msgs }: buildRosPackage { pname = "ros-noetic-steering-functions"; - version = "0.1.0-r1"; + version = "0.1.1-r1"; src = fetchurl { - url = "https://github.com/nobleo/steering_functions-release/archive/release/noetic/steering_functions/0.1.0-1.tar.gz"; - name = "0.1.0-1.tar.gz"; - sha256 = "b5c609ae4d3cc7ac00530c7ef805d9cc9f0313dd3b3be10dca6cf8481ceb052e"; + url = "https://github.com/nobleo/steering_functions-release/archive/release/noetic/steering_functions/0.1.1-1.tar.gz"; + name = "0.1.1-1.tar.gz"; + sha256 = "2a652f09d03ada9a6959f635e36563705c6e3447b809a154f377206197493cc4"; }; buildType = "catkin"; diff --git a/distros/noetic/tesseract-common/default.nix b/distros/noetic/tesseract-common/default.nix index 9eba33c52e..8722d0053e 100644 --- a/distros/noetic/tesseract-common/default.nix +++ b/distros/noetic/tesseract-common/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, boost, clang, cmake, console-bridge, eigen, gtest, lcov, libyamlcpp, ros-industrial-cmake-boilerplate, tinyxml-2 }: buildRosPackage { pname = "ros-noetic-tesseract-common"; - version = "0.6.9-r1"; + version = "0.8.6-r1"; src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_common/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "73217c9e35b1f3cd3bf76335670f7e2d2b92bcd7b82df1e65a7a8121307f691c"; + url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_common/0.8.6-1.tar.gz"; + name = "0.8.6-1.tar.gz"; + sha256 = "5c4ece28129365022c802643d8003476e3bdee5c0ce36a45ab150864c7ec3f25"; }; buildType = "cmake"; diff --git a/distros/noetic/tesseract-environment/default.nix b/distros/noetic/tesseract-environment/default.nix index 1c2a0e5ad2..a6b76298c2 100644 --- a/distros/noetic/tesseract-environment/default.nix +++ b/distros/noetic/tesseract-environment/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, cmake, console-bridge, eigen, gtest, llvmPackages, ros-industrial-cmake-boilerplate, tesseract-collision, tesseract-common, tesseract-geometry, tesseract-kinematics, tesseract-scene-graph, tesseract-srdf, tesseract-state-solver, tesseract-support, tesseract-urdf }: buildRosPackage { pname = "ros-noetic-tesseract-environment"; - version = "0.6.9-r1"; + version = "0.8.6-r1"; src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_environment/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "1279398792cdb278b3225a028960a68747aab10bdbe4d4cc961a8bb3819608d7"; + url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_environment/0.8.6-1.tar.gz"; + name = "0.8.6-1.tar.gz"; + sha256 = "c9992fd05f8487eea55117b6fa881edbf55b608b4ed62abe98b61e8841297177"; }; buildType = "cmake"; diff --git a/distros/noetic/tesseract-geometry/default.nix b/distros/noetic/tesseract-geometry/default.nix index aba2e426c2..31e7ff8e88 100644 --- a/distros/noetic/tesseract-geometry/default.nix +++ b/distros/noetic/tesseract-geometry/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, assimp, cmake, console-bridge, eigen, gtest, octomap, ros-industrial-cmake-boilerplate, tesseract-common, tesseract-support }: buildRosPackage { pname = "ros-noetic-tesseract-geometry"; - version = "0.6.9-r1"; + version = "0.8.6-r1"; src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_geometry/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "806405f99c8719c879b1b7c60944d9e73ed0670d323cbf73505f4252d7e0c374"; + url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_geometry/0.8.6-1.tar.gz"; + name = "0.8.6-1.tar.gz"; + sha256 = "b478751f162246eef72f690590fef994a3805bbaf2ee7c9eed6dbb7ad652b083"; }; buildType = "cmake"; diff --git a/distros/noetic/tesseract-kinematics/default.nix b/distros/noetic/tesseract-kinematics/default.nix index 69ba525850..824680099b 100644 --- a/distros/noetic/tesseract-kinematics/default.nix +++ b/distros/noetic/tesseract-kinematics/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, cmake, console-bridge, eigen, gtest, libyamlcpp, opw-kinematics, orocos-kdl, ros-industrial-cmake-boilerplate, tesseract-common, tesseract-scene-graph, tesseract-state-solver, tesseract-support, tesseract-urdf }: buildRosPackage { pname = "ros-noetic-tesseract-kinematics"; - version = "0.6.9-r1"; + version = "0.8.6-r1"; src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_kinematics/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "e119de3d804b70bfd710faeca7e4db98b094dc2fa50c2b2f15ec00d3877ab6ad"; + url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_kinematics/0.8.6-1.tar.gz"; + name = "0.8.6-1.tar.gz"; + sha256 = "34bd6f187f97406224e16611c69db6d04978c167a2faf024539d6b982416478f"; }; buildType = "cmake"; diff --git a/distros/noetic/tesseract-scene-graph/default.nix b/distros/noetic/tesseract-scene-graph/default.nix index 51adfc3ff8..d4d0a01c37 100644 --- a/distros/noetic/tesseract-scene-graph/default.nix +++ b/distros/noetic/tesseract-scene-graph/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, boost, cmake, console-bridge, eigen, gtest, orocos-kdl, ros-industrial-cmake-boilerplate, tesseract-common, tesseract-geometry, tesseract-support }: buildRosPackage { pname = "ros-noetic-tesseract-scene-graph"; - version = "0.6.9-r1"; + version = "0.8.6-r1"; src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_scene_graph/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "34719e15d2dd3605803e6903c39c97b2b9e500725e0670e78f2603b2dbe4c244"; + url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_scene_graph/0.8.6-1.tar.gz"; + name = "0.8.6-1.tar.gz"; + sha256 = "2fc3a129727bafdbd2b6f4813c4d98268881440d73816434a3b8a43dfc4a5135"; }; buildType = "cmake"; diff --git a/distros/noetic/tesseract-srdf/default.nix b/distros/noetic/tesseract-srdf/default.nix index fdbcd1f558..07227c3381 100644 --- a/distros/noetic/tesseract-srdf/default.nix +++ b/distros/noetic/tesseract-srdf/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, cmake, console-bridge, eigen, gtest, libyamlcpp, ros-industrial-cmake-boilerplate, tesseract-common, tesseract-scene-graph, tesseract-support }: buildRosPackage { pname = "ros-noetic-tesseract-srdf"; - version = "0.6.9-r1"; + version = "0.8.6-r1"; src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_srdf/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "741fab96e27ab3d056bf250e5f3b77b61cb32762405310b5016e16f9462fdd0b"; + url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_srdf/0.8.6-1.tar.gz"; + name = "0.8.6-1.tar.gz"; + sha256 = "78887ebdad2465941e5abe95945548f28f92c648405af0b8d7c56de9df7da057"; }; buildType = "cmake"; diff --git a/distros/noetic/tesseract-state-solver/default.nix b/distros/noetic/tesseract-state-solver/default.nix index d164ddb3ef..a105da6c3e 100644 --- a/distros/noetic/tesseract-state-solver/default.nix +++ b/distros/noetic/tesseract-state-solver/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, cmake, console-bridge, eigen, gtest, orocos-kdl, ros-industrial-cmake-boilerplate, tesseract-common, tesseract-scene-graph, tesseract-support, tesseract-urdf }: buildRosPackage { pname = "ros-noetic-tesseract-state-solver"; - version = "0.6.9-r1"; + version = "0.8.6-r1"; src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_state_solver/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "16475414eb53d97280a5a2d6eb06581788087b8c636b0ac4c6beb96452a05e1a"; + url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_state_solver/0.8.6-1.tar.gz"; + name = "0.8.6-1.tar.gz"; + sha256 = "276a04d82d2fbd90a0bd4d837a0bf8146a16e2189abeaef32c815c554c625b60"; }; buildType = "cmake"; diff --git a/distros/noetic/tesseract-support/default.nix b/distros/noetic/tesseract-support/default.nix index 168ae1371e..5fccf8fd75 100644 --- a/distros/noetic/tesseract-support/default.nix +++ b/distros/noetic/tesseract-support/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, cmake, ros-industrial-cmake-boilerplate, tesseract-common }: buildRosPackage { pname = "ros-noetic-tesseract-support"; - version = "0.6.9-r1"; + version = "0.8.6-r1"; src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_support/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "c65f97879f060844ddaf1c768083fad7429acc599782be318e2f4625dcec61ff"; + url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_support/0.8.6-1.tar.gz"; + name = "0.8.6-1.tar.gz"; + sha256 = "bf93f39eecfde80a2434bd4eeef21a305cc1deed3e4cfcacdc636436c2b1ab92"; }; buildType = "cmake"; diff --git a/distros/noetic/tesseract-urdf/default.nix b/distros/noetic/tesseract-urdf/default.nix index f4ec6b2c44..7e5b8dc76a 100644 --- a/distros/noetic/tesseract-urdf/default.nix +++ b/distros/noetic/tesseract-urdf/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, cmake, console-bridge, eigen, gtest, pcl, ros-industrial-cmake-boilerplate, tesseract-collision, tesseract-common, tesseract-geometry, tesseract-scene-graph, tesseract-support }: buildRosPackage { pname = "ros-noetic-tesseract-urdf"; - version = "0.6.9-r1"; + version = "0.8.6-r1"; src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_urdf/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "33e347b263d85b400cbd20b06c213bd18ff2bd4c4b18b53e55eef4a9d956d5d3"; + url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_urdf/0.8.6-1.tar.gz"; + name = "0.8.6-1.tar.gz"; + sha256 = "150e54042c1be7c974cd53c1bdba2518bc7780ca398ca2d66470328c8940b18d"; }; buildType = "cmake"; diff --git a/distros/noetic/tesseract-visualization/default.nix b/distros/noetic/tesseract-visualization/default.nix index b07b1b3a1c..836aed6d68 100644 --- a/distros/noetic/tesseract-visualization/default.nix +++ b/distros/noetic/tesseract-visualization/default.nix @@ -5,12 +5,12 @@ { lib, buildRosPackage, fetchurl, cmake, console-bridge, eigen, ros-industrial-cmake-boilerplate, tesseract-collision, tesseract-common, tesseract-environment, tesseract-scene-graph, tesseract-state-solver }: buildRosPackage { pname = "ros-noetic-tesseract-visualization"; - version = "0.6.9-r1"; + version = "0.8.6-r1"; src = fetchurl { - url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_visualization/0.6.9-1.tar.gz"; - name = "0.6.9-1.tar.gz"; - sha256 = "ce8a56353bf1f3f1875f9efcea54b74468d4ce9d32975f0f4df078b6bd0e13ae"; + url = "https://github.com/ros-industrial-release/tesseract-release/archive/release/noetic/tesseract_visualization/0.8.6-1.tar.gz"; + name = "0.8.6-1.tar.gz"; + sha256 = "ccae1dd8faef9902d4bf96c31ea88c5093f3c12c900b5436622c58355b04f43b"; }; buildType = "cmake"; diff --git a/distros/noetic/test-mavros/default.nix b/distros/noetic/test-mavros/default.nix index 79111f45df..477260f029 100644 --- a/distros/noetic/test-mavros/default.nix +++ b/distros/noetic/test-mavros/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Tests for MAVROS package''; - license = with lib.licenses; [ bsdOriginal gpl3 lgpl2 ]; + license = with lib.licenses; [ bsdOriginal "GPL-3.0-only" "LGPL-3.0-only" ]; }; } diff --git a/distros/noetic/toposens-bringup/default.nix b/distros/noetic/toposens-bringup/default.nix new file mode 100644 index 0000000000..93a8e2ec77 --- /dev/null +++ b/distros/noetic/toposens-bringup/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, joint-state-publisher, robot-state-publisher, rqt-gui, rqt-reconfigure, rviz, socketcan-bridge, toposens-description, toposens-driver, toposens-echo-driver, toposens-markers, toposens-pointcloud, turtlebot3-bringup, turtlebot3-teleop, xacro }: +buildRosPackage { + pname = "ros-noetic-toposens-bringup"; + version = "2.3.2-r2"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/noetic/toposens_bringup/2.3.2-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "54e7e3baf139f4996c2cc12e83f73b7a1d769d4e5bd25ccb75296b2b14a84f92"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ joint-state-publisher robot-state-publisher rqt-gui rqt-reconfigure rviz socketcan-bridge toposens-description toposens-driver toposens-echo-driver toposens-markers toposens-pointcloud turtlebot3-bringup turtlebot3-teleop xacro ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Launch files for bringup and demos of toposens package.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/noetic/toposens-description/default.nix b/distros/noetic/toposens-description/default.nix new file mode 100644 index 0000000000..0d349d6313 --- /dev/null +++ b/distros/noetic/toposens-description/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, joint-state-publisher, robot-state-publisher, rviz, urdf, xacro }: +buildRosPackage { + pname = "ros-noetic-toposens-description"; + version = "2.3.2-r2"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/noetic/toposens_description/2.3.2-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "8ad188cbefde05810ca844cadc822522698b5614337c7dd70a5976aa04d1c05d"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ joint-state-publisher robot-state-publisher rviz urdf xacro ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''3D models of the sensor for visualization.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/noetic/toposens-driver/default.nix b/distros/noetic/toposens-driver/default.nix new file mode 100644 index 0000000000..4ed2dc3b34 --- /dev/null +++ b/distros/noetic/toposens-driver/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, dynamic-reconfigure, message-runtime, roscpp, roslaunch, rostest, toposens-msgs }: +buildRosPackage { + pname = "ros-noetic-toposens-driver"; + version = "2.3.2-r2"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/noetic/toposens_driver/2.3.2-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "411b5006ac4d6785b021a67394a035c06dd439ff88caa6de02a1d85d04c9dda2"; + }; + + buildType = "catkin"; + checkInputs = [ roslaunch rostest ]; + propagatedBuildInputs = [ dynamic-reconfigure message-runtime roscpp toposens-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''ROS device driver for communication with TS sensors.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/noetic/toposens-echo-driver/default.nix b/distros/noetic/toposens-echo-driver/default.nix new file mode 100644 index 0000000000..17e1eed66b --- /dev/null +++ b/distros/noetic/toposens-echo-driver/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, cmake-modules, dynamic-reconfigure, genmsg, message-generation, message-runtime, roscpp, std-msgs, tf, tf2-ros, toposens-msgs }: +buildRosPackage { + pname = "ros-noetic-toposens-echo-driver"; + version = "2.3.2-r2"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/noetic/toposens_echo_driver/2.3.2-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "a814172b5efd096897432cbc131255850a53c5d89b8b9a4627d8c76e96e8184b"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ cmake-modules dynamic-reconfigure genmsg message-generation message-runtime roscpp std-msgs tf tf2-ros toposens-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''ROS device driver for communication with TS ECHO sensors on a CAN bus''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/noetic/toposens-markers/default.nix b/distros/noetic/toposens-markers/default.nix new file mode 100644 index 0000000000..bfcf37fb12 --- /dev/null +++ b/distros/noetic/toposens-markers/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, dynamic-reconfigure, message-runtime, roscpp, roslaunch, rostest, rviz-visual-tools, tf2-geometry-msgs, toposens-description, toposens-driver, toposens-msgs }: +buildRosPackage { + pname = "ros-noetic-toposens-markers"; + version = "2.3.2-r2"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/noetic/toposens_markers/2.3.2-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "3e35853284472575c54c817caad82306a0d044fcc1b6817c93b6bf628ad8794e"; + }; + + buildType = "catkin"; + checkInputs = [ roslaunch rostest ]; + propagatedBuildInputs = [ dynamic-reconfigure message-runtime roscpp rviz-visual-tools tf2-geometry-msgs toposens-description toposens-driver toposens-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Rviz integration for TS sensor data.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/noetic/toposens-msgs/default.nix b/distros/noetic/toposens-msgs/default.nix new file mode 100644 index 0000000000..7fcf571653 --- /dev/null +++ b/distros/noetic/toposens-msgs/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, std-msgs }: +buildRosPackage { + pname = "ros-noetic-toposens-msgs"; + version = "2.3.2-r2"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/noetic/toposens_msgs/2.3.2-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "37cca9c7f4159ef1be134ec018f7b3e0dec6b64b7704c0cb463330f6369746bb"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ geometry-msgs message-generation message-runtime std-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''ROS message definitions for TS sensors.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/noetic/toposens-pointcloud/default.nix b/distros/noetic/toposens-pointcloud/default.nix new file mode 100644 index 0000000000..dee76116b0 --- /dev/null +++ b/distros/noetic/toposens-pointcloud/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-runtime, pcl-ros, roscpp, roslaunch, rostest, tf2, tf2-geometry-msgs, toposens-driver, toposens-msgs, visualization-msgs }: +buildRosPackage { + pname = "ros-noetic-toposens-pointcloud"; + version = "2.3.2-r2"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/noetic/toposens_pointcloud/2.3.2-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "7047dcf9ebc0a6383a42f4665b4c756538de1c21a2d6be2ad2a0d623fb23b059"; + }; + + buildType = "catkin"; + checkInputs = [ roslaunch rostest ]; + propagatedBuildInputs = [ geometry-msgs message-runtime pcl-ros roscpp tf2 tf2-geometry-msgs toposens-driver toposens-msgs visualization-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''PCL integration for TS sensors mounted on Turtlebot3.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/noetic/toposens-sync/default.nix b/distros/noetic/toposens-sync/default.nix new file mode 100644 index 0000000000..179a7bacf3 --- /dev/null +++ b/distros/noetic/toposens-sync/default.nix @@ -0,0 +1,25 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, code-coverage, message-runtime, roscpp, roslaunch, rostest, toposens-driver, toposens-msgs }: +buildRosPackage { + pname = "ros-noetic-toposens-sync"; + version = "2.3.2-r2"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/noetic/toposens_sync/2.3.2-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "7e3cd9eb72a04346b677b0b41976251d9077787ddc958168ddacd3ffee670d3a"; + }; + + buildType = "catkin"; + checkInputs = [ code-coverage roslaunch rostest ]; + propagatedBuildInputs = [ message-runtime roscpp toposens-driver toposens-msgs ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''Operational sync of multiple TS sensors.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/noetic/toposens/default.nix b/distros/noetic/toposens/default.nix new file mode 100644 index 0000000000..5be6ba4d29 --- /dev/null +++ b/distros/noetic/toposens/default.nix @@ -0,0 +1,24 @@ + +# Copyright 2022 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, toposens-bringup, toposens-description, toposens-driver, toposens-echo-driver, toposens-markers, toposens-msgs, toposens-pointcloud, toposens-sync }: +buildRosPackage { + pname = "ros-noetic-toposens"; + version = "2.3.2-r2"; + + src = fetchurl { + url = "https://gitlab.com/toposens/public/toposens-release/-/archive/release/noetic/toposens/2.3.2-2/archive.tar.gz"; + name = "archive.tar.gz"; + sha256 = "8955b896585206b46802fa6bdd111f4853b181f65dbe45f30f037fce051eb9d4"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ toposens-bringup toposens-description toposens-driver toposens-echo-driver toposens-markers toposens-msgs toposens-pointcloud toposens-sync ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''ROS support for Toposens 3D Ultrasound sensors.''; + license = with lib.licenses; [ "BSD-3-Clause" ]; + }; +} diff --git a/distros/noetic/trajectory-tracker-rviz-plugins/default.nix b/distros/noetic/trajectory-tracker-rviz-plugins/default.nix index 9536cc27e7..9f4bcbaddb 100644 --- a/distros/noetic/trajectory-tracker-rviz-plugins/default.nix +++ b/distros/noetic/trajectory-tracker-rviz-plugins/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Rviz plugins for trajectory_tracker_msgs''; - license = with lib.licenses; [ bsdOriginal "CC-BY-SA-3.0" ]; + license = with lib.licenses; [ bsdOriginal "Creative-Commons" ]; }; } diff --git a/distros/noetic/ubiquity-motor/default.nix b/distros/noetic/ubiquity-motor/default.nix index 4972826000..399e205e25 100644 --- a/distros/noetic/ubiquity-motor/default.nix +++ b/distros/noetic/ubiquity-motor/default.nix @@ -2,21 +2,21 @@ # Copyright 2022 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, controller-manager, diagnostic-updater, diff-drive-controller, dynamic-reconfigure, geometry-msgs, hardware-interface, joint-state-controller, nav-msgs, python3Packages, roscpp, rostest, std-msgs, tf }: +{ lib, buildRosPackage, fetchurl, catkin, controller-manager, diagnostic-updater, diff-drive-controller, dynamic-reconfigure, geometry-msgs, hardware-interface, joint-state-controller, message-generation, message-runtime, nav-msgs, python3Packages, roscpp, rostest, std-msgs, tf }: buildRosPackage { pname = "ros-noetic-ubiquity-motor"; - version = "0.13.2-r1"; + version = "0.14.0-r1"; src = fetchurl { - url = "https://github.com/UbiquityRobotics-release/ubiquity_motor-release/archive/release/noetic/ubiquity_motor/0.13.2-1.tar.gz"; - name = "0.13.2-1.tar.gz"; - sha256 = "3fde6fb69306cea15e1434c20645f5a6d0176e93e1afa13e12a9dea4911a2095"; + url = "https://github.com/UbiquityRobotics-release/ubiquity_motor-release/archive/release/noetic/ubiquity_motor/0.14.0-1.tar.gz"; + name = "0.14.0-1.tar.gz"; + sha256 = "5586a39112e8b8cea95553c554d1203215d4db84e89cd1c826cd7d368b875c74"; }; buildType = "catkin"; - buildInputs = [ roscpp ]; + buildInputs = [ message-generation roscpp ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ controller-manager diagnostic-updater diff-drive-controller dynamic-reconfigure geometry-msgs hardware-interface joint-state-controller nav-msgs python3Packages.requests std-msgs tf ]; + propagatedBuildInputs = [ controller-manager diagnostic-updater diff-drive-controller dynamic-reconfigure geometry-msgs hardware-interface joint-state-controller message-runtime nav-msgs python3Packages.requests std-msgs tf ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/ur-client-library/default.nix b/distros/noetic/ur-client-library/default.nix index 5678f54522..8dba1fd1f7 100644 --- a/distros/noetic/ur-client-library/default.nix +++ b/distros/noetic/ur-client-library/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Standalone C++ library for accessing Universal Robots interfaces. This has been forked off the ur_robot_driver.''; - license = with lib.licenses; [ asl20 bsd2 "Zlib" mit ]; + license = with lib.licenses; [ asl20 "BSD-2-Clause" "Zlib" mit ]; }; } diff --git a/distros/noetic/ur-msgs/default.nix b/distros/noetic/ur-msgs/default.nix index 0a0a97c2cf..72350042b3 100644 --- a/distros/noetic/ur-msgs/default.nix +++ b/distros/noetic/ur-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Message and service definitions for interacting with Universal Robots robot controllers.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/variant-msgs/default.nix b/distros/noetic/variant-msgs/default.nix index d9fb46ea67..e6d1977401 100644 --- a/distros/noetic/variant-msgs/default.nix +++ b/distros/noetic/variant-msgs/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { 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 = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "GNU-Lesser-General-Public-License-LGPL-" ]; }; } diff --git a/distros/noetic/variant-topic-tools/default.nix b/distros/noetic/variant-topic-tools/default.nix index 744c2c2426..ef675ac804 100644 --- a/distros/noetic/variant-topic-tools/default.nix +++ b/distros/noetic/variant-topic-tools/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''Topic tools for treating messages as variant types.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "GNU-Lesser-General-Public-License-LGPL-" ]; }; } diff --git a/distros/noetic/variant/default.nix b/distros/noetic/variant/default.nix index b11bcaa343..f9b2c6db62 100644 --- a/distros/noetic/variant/default.nix +++ b/distros/noetic/variant/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Meta-package for the universal variant library.''; - license = with lib.licenses; [ lgpl2 ]; + license = with lib.licenses; [ "GNU-Lesser-General-Public-License-LGPL-" ]; }; } diff --git a/distros/noetic/vision-visp/default.nix b/distros/noetic/vision-visp/default.nix index 944e633068..ffb79cbefc 100644 --- a/distros/noetic/vision-visp/default.nix +++ b/distros/noetic/vision-visp/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Virtual package providing ViSP related packages.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/noetic/visp-auto-tracker/default.nix b/distros/noetic/visp-auto-tracker/default.nix index 81046210b3..202d67f95e 100644 --- a/distros/noetic/visp-auto-tracker/default.nix +++ b/distros/noetic/visp-auto-tracker/default.nix @@ -30,6 +30,6 @@ buildRosPackage { This computer vision algorithm computes the pose (i.e. position and orientation) of an object in an image. It is fast enough to allow object online tracking using a camera.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/noetic/visp-bridge/default.nix b/distros/noetic/visp-bridge/default.nix index 9522057612..8310036a8a 100644 --- a/distros/noetic/visp-bridge/default.nix +++ b/distros/noetic/visp-bridge/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''Converts between ROS structures and ViSP structures.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/noetic/visp-camera-calibration/default.nix b/distros/noetic/visp-camera-calibration/default.nix index 68499b41fb..03a2ff679e 100644 --- a/distros/noetic/visp-camera-calibration/default.nix +++ b/distros/noetic/visp-camera-calibration/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''visp_camera_calibration allows easy calibration of cameras using a customizable pattern and ViSP library.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/noetic/visp-hand2eye-calibration/default.nix b/distros/noetic/visp-hand2eye-calibration/default.nix index 7c7544a24b..1e263f8e22 100644 --- a/distros/noetic/visp-hand2eye-calibration/default.nix +++ b/distros/noetic/visp-hand2eye-calibration/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''visp_hand2eye_calibration estimates the camera position with respect to its effector using the ViSP library.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/noetic/visp-tracker/default.nix b/distros/noetic/visp-tracker/default.nix index 60100f8ed2..eec0b8ce50 100644 --- a/distros/noetic/visp-tracker/default.nix +++ b/distros/noetic/visp-tracker/default.nix @@ -24,6 +24,6 @@ buildRosPackage { This computer vision algorithm computes the pose (i.e. position and orientation) of an object in an image. It is fast enough to allow object online tracking using a camera.''; - license = with lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ "GPL-2.0-only" ]; }; } diff --git a/distros/noetic/voice-text/default.nix b/distros/noetic/voice-text/default.nix index d64bd68dbd..3775b4ad21 100644 --- a/distros/noetic/voice-text/default.nix +++ b/distros/noetic/voice-text/default.nix @@ -20,6 +20,6 @@ buildRosPackage { meta = { description = ''voice_text (www.voicetext.jp)''; - license = with lib.licenses; [ "HOYA License" ]; + license = with lib.licenses; [ "HOYA-License" ]; }; } diff --git a/distros/noetic/volta-base/default.nix b/distros/noetic/volta-base/default.nix index 86d14abc17..e1a37a65bf 100644 --- a/distros/noetic/volta-base/default.nix +++ b/distros/noetic/volta-base/default.nix @@ -18,6 +18,6 @@ buildRosPackage { meta = { description = ''The volta_base package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/volta-control/default.nix b/distros/noetic/volta-control/default.nix index 1b14bd4c35..53e3f4db54 100644 --- a/distros/noetic/volta-control/default.nix +++ b/distros/noetic/volta-control/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_control package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/volta-description/default.nix b/distros/noetic/volta-description/default.nix index 89e9d8719f..f97ac1efe7 100644 --- a/distros/noetic/volta-description/default.nix +++ b/distros/noetic/volta-description/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_description package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/volta-localization/default.nix b/distros/noetic/volta-localization/default.nix index 2e62dc6cf2..f51b0c1517 100644 --- a/distros/noetic/volta-localization/default.nix +++ b/distros/noetic/volta-localization/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_localization package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/volta-msgs/default.nix b/distros/noetic/volta-msgs/default.nix index 6b0bd969f5..a08d692c07 100644 --- a/distros/noetic/volta-msgs/default.nix +++ b/distros/noetic/volta-msgs/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_msgs package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/volta-navigation/default.nix b/distros/noetic/volta-navigation/default.nix index f8201147a9..e2d669eb19 100644 --- a/distros/noetic/volta-navigation/default.nix +++ b/distros/noetic/volta-navigation/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_navigation package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/volta-rules/default.nix b/distros/noetic/volta-rules/default.nix index 2e6dfdd3fa..a54cd803bb 100644 --- a/distros/noetic/volta-rules/default.nix +++ b/distros/noetic/volta-rules/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_rules package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/volta-teleoperator/default.nix b/distros/noetic/volta-teleoperator/default.nix index f8673dbadc..1564c28902 100644 --- a/distros/noetic/volta-teleoperator/default.nix +++ b/distros/noetic/volta-teleoperator/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''The volta_teleoperator package''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-3-Clause" ]; }; } diff --git a/distros/noetic/vrpn/default.nix b/distros/noetic/vrpn/default.nix index 49f0ea479f..a92bd42547 100644 --- a/distros/noetic/vrpn/default.nix +++ b/distros/noetic/vrpn/default.nix @@ -19,6 +19,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 = with lib.licenses; [ "BSL1.0" ]; + license = with lib.licenses; [ "BSL-1.0" ]; }; } diff --git a/distros/noetic/wge100-camera/default.nix b/distros/noetic/wge100-camera/default.nix index 0faff45d84..9ceeb9d210 100644 --- a/distros/noetic/wge100-camera/default.nix +++ b/distros/noetic/wge100-camera/default.nix @@ -22,6 +22,6 @@ buildRosPackage { 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 ]; + license = with lib.licenses; [ "GPL-because-of-list.h-&-other-files-released-under-BSD" ]; }; } diff --git a/distros/noetic/wge100-driver/default.nix b/distros/noetic/wge100-driver/default.nix index 959af90f1c..38cdfa5a09 100644 --- a/distros/noetic/wge100-driver/default.nix +++ b/distros/noetic/wge100-driver/default.nix @@ -19,6 +19,6 @@ buildRosPackage { meta = { description = ''This stack contains the ROS driver and firmware for the WGE100 camera used on the PR2 robot.''; - license = with lib.licenses; [ bsdOriginal ]; + license = with lib.licenses; [ "BSD-&-GPL-because-of-list.h-&-other-files-released-under-BSD-&-GPL" ]; }; } diff --git a/distros/noetic/xmlrpcpp/default.nix b/distros/noetic/xmlrpcpp/default.nix index af6065d707..1b5fbb01f6 100644 --- a/distros/noetic/xmlrpcpp/default.nix +++ b/distros/noetic/xmlrpcpp/default.nix @@ -23,6 +23,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 = with lib.licenses; [ lgpl21 ]; + license = with lib.licenses; [ "LGPL-2.1-only" ]; }; }