From dcdd32fcfebc067c26451cc80caeb49a416d3d98 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 12 Jun 2020 22:07:37 -0400 Subject: [PATCH] regenerate all distros, Fri Jun 12 22:07:37 2020 --- distros/noetic/bondpy/default.nix | 4 +- .../controller-manager-msgs/default.nix | 4 +- .../controller-manager-tests/default.nix | 4 +- distros/noetic/controller-manager/default.nix | 4 +- distros/noetic/eigenpy/default.nix | 4 +- distros/noetic/fadecandy-driver/default.nix | 4 +- distros/noetic/gencpp/default.nix | 4 +- distros/noetic/generated.nix | 32 ++-------------- distros/noetic/geneus/default.nix | 4 +- distros/noetic/genlisp/default.nix | 4 +- distros/noetic/genmsg/default.nix | 6 +-- distros/noetic/gennodejs/default.nix | 4 +- distros/noetic/genpy/default.nix | 6 +-- distros/noetic/geodesy/default.nix | 8 ++-- distros/noetic/jderobot-assets/default.nix | 4 +- distros/noetic/laser-geometry/default.nix | 4 +- distros/noetic/mavlink/default.nix | 4 +- distros/noetic/mrt-cmake-modules/default.nix | 6 +-- distros/noetic/pinocchio/default.nix | 4 +- distros/noetic/pybind11-catkin/default.nix | 4 +- distros/noetic/python-qt-binding/default.nix | 4 +- distros/noetic/qt-dotgraph/default.nix | 8 ++-- distros/noetic/qt-gui-app/default.nix | 4 +- distros/noetic/qt-gui-cpp/default.nix | 4 +- distros/noetic/qt-gui-py-common/default.nix | 6 +-- distros/noetic/qt-gui/default.nix | 8 ++-- distros/noetic/resource-retriever/default.nix | 4 +- distros/noetic/rosboost-cfg/default.nix | 4 +- distros/noetic/rosbridge-library/default.nix | 4 +- distros/noetic/rosbridge-server/default.nix | 4 +- distros/noetic/rosclean/default.nix | 6 +-- distros/noetic/roscreate/default.nix | 6 +-- distros/noetic/rosdoc-lite/default.nix | 28 ++++++++++++++ distros/noetic/rosgraph/default.nix | 6 +-- distros/noetic/roslib/default.nix | 6 +-- distros/noetic/rosmake/default.nix | 6 +-- distros/noetic/rosmon-core/default.nix | 6 +-- distros/noetic/rosmsg/default.nix | 4 +- distros/noetic/rosparam/default.nix | 4 +- distros/noetic/rospy/default.nix | 4 +- distros/noetic/rosunit/default.nix | 6 +-- distros/noetic/rqt-bag-plugins/default.nix | 4 +- distros/noetic/rqt-bag/default.nix | 4 +- distros/noetic/rqt-console/default.nix | 4 +- .../noetic/rqt-controller-manager/default.nix | 4 +- distros/noetic/rqt-dep/default.nix | 6 +-- distros/noetic/rqt-graph/default.nix | 4 +- distros/noetic/rqt-logger-level/default.nix | 4 +- distros/noetic/rqt-moveit/default.nix | 4 +- distros/noetic/rqt-msg/default.nix | 4 +- distros/noetic/rqt-plot/default.nix | 4 +- distros/noetic/rqt-publisher/default.nix | 4 +- distros/noetic/rqt-py-console/default.nix | 4 +- distros/noetic/rqt-reconfigure/default.nix | 6 +-- .../noetic/rqt-robot-dashboard/default.nix | 4 +- distros/noetic/rqt-robot-monitor/default.nix | 37 +++++++++++++++++++ distros/noetic/rqt-robot-steering/default.nix | 4 +- .../noetic/rqt-runtime-monitor/default.nix | 4 +- distros/noetic/rqt-service-caller/default.nix | 4 +- distros/noetic/rqt-shell/default.nix | 4 +- distros/noetic/rqt-tf-tree/default.nix | 6 +-- distros/noetic/rqt-top/default.nix | 4 +- distros/noetic/rqt-topic/default.nix | 4 +- distros/noetic/rqt-web/default.nix | 4 +- distros/noetic/sensor-msgs/default.nix | 4 +- distros/noetic/smclib/default.nix | 4 +- distros/noetic/urdfdom-py/default.nix | 8 ++-- 67 files changed, 219 insertions(+), 178 deletions(-) create mode 100644 distros/noetic/rosdoc-lite/default.nix create mode 100644 distros/noetic/rqt-robot-monitor/default.nix diff --git a/distros/noetic/bondpy/default.nix b/distros/noetic/bondpy/default.nix index 9c363ecc94..b8cbad7611 100644 --- a/distros/noetic/bondpy/default.nix +++ b/distros/noetic/bondpy/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, bond, catkin, pythonPackages, rospy, smclib, utillinux }: +{ lib, buildRosPackage, fetchurl, bond, catkin, python3Packages, rospy, smclib, utillinux }: buildRosPackage { pname = "ros-noetic-bondpy"; version = "1.8.5-r1"; @@ -16,7 +16,7 @@ buildRosPackage { buildType = "catkin"; buildInputs = [ bond ]; propagatedBuildInputs = [ rospy smclib utillinux ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Python implementation of bond, a mechanism for checking when diff --git a/distros/noetic/controller-manager-msgs/default.nix b/distros/noetic/controller-manager-msgs/default.nix index 30075c73e2..6c8ce684a0 100644 --- a/distros/noetic/controller-manager-msgs/default.nix +++ b/distros/noetic/controller-manager-msgs/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, pythonPackages, rospy, rosservice, std-msgs }: +{ lib, buildRosPackage, fetchurl, catkin, message-generation, message-runtime, python3Packages, rospy, rosservice, std-msgs }: buildRosPackage { pname = "ros-noetic-controller-manager-msgs"; version = "0.19.1-r1"; @@ -16,7 +16,7 @@ buildRosPackage { buildType = "catkin"; buildInputs = [ message-generation ]; propagatedBuildInputs = [ message-runtime rospy rosservice std-msgs ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Messages and services for the controller manager.''; diff --git a/distros/noetic/controller-manager-tests/default.nix b/distros/noetic/controller-manager-tests/default.nix index 2881cdd4ef..f783dfb196 100644 --- a/distros/noetic/controller-manager-tests/default.nix +++ b/distros/noetic/controller-manager-tests/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, controller-interface, controller-manager, controller-manager-msgs, hardware-interface, pluginlib, pythonPackages, rosbash, roscpp, rosnode, rospy, rostest }: +{ lib, buildRosPackage, fetchurl, catkin, controller-interface, controller-manager, controller-manager-msgs, hardware-interface, pluginlib, python3Packages, rosbash, roscpp, rosnode, rospy, rostest }: buildRosPackage { pname = "ros-noetic-controller-manager-tests"; version = "0.19.1-r1"; @@ -16,7 +16,7 @@ buildRosPackage { buildType = "catkin"; checkInputs = [ rosbash rosnode rostest ]; propagatedBuildInputs = [ controller-interface controller-manager controller-manager-msgs hardware-interface pluginlib roscpp rospy ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Tests for the controller manager.''; diff --git a/distros/noetic/controller-manager/default.nix b/distros/noetic/controller-manager/default.nix index 6ddd4bc024..1527793916 100644 --- a/distros/noetic/controller-manager/default.nix +++ b/distros/noetic/controller-manager/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, controller-interface, controller-manager-msgs, hardware-interface, pluginlib, pythonPackages, roscpp, rosparam, rospy, rostest, std-msgs }: +{ lib, buildRosPackage, fetchurl, catkin, controller-interface, controller-manager-msgs, hardware-interface, pluginlib, python3Packages, roscpp, rosparam, rospy, rostest, std-msgs }: buildRosPackage { pname = "ros-noetic-controller-manager"; version = "0.19.1-r1"; @@ -16,7 +16,7 @@ buildRosPackage { buildType = "catkin"; checkInputs = [ rostest ]; propagatedBuildInputs = [ controller-interface controller-manager-msgs hardware-interface pluginlib roscpp rosparam rospy std-msgs ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''The controller manager.''; diff --git a/distros/noetic/eigenpy/default.nix b/distros/noetic/eigenpy/default.nix index c1c5867353..b1c0e908a8 100644 --- a/distros/noetic/eigenpy/default.nix +++ b/distros/noetic/eigenpy/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, boost, cmake, doxygen, eigen, git, python, pythonPackages }: +{ lib, buildRosPackage, fetchurl, boost, cmake, doxygen, eigen, git, python3, python3Packages }: buildRosPackage { pname = "ros-noetic-eigenpy"; version = "2.4.0-r1"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "cmake"; buildInputs = [ doxygen git ]; - propagatedBuildInputs = [ boost eigen python pythonPackages.numpy ]; + propagatedBuildInputs = [ boost eigen python3 python3Packages.numpy ]; nativeBuildInputs = [ cmake ]; meta = { diff --git a/distros/noetic/fadecandy-driver/default.nix b/distros/noetic/fadecandy-driver/default.nix index e09030a2a6..48c65d9922 100644 --- a/distros/noetic/fadecandy-driver/default.nix +++ b/distros/noetic/fadecandy-driver/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, diagnostic-updater, fadecandy-msgs, pythonPackages, rospy }: +{ lib, buildRosPackage, fetchurl, catkin, diagnostic-updater, fadecandy-msgs, python3Packages, rospy }: buildRosPackage { pname = "ros-noetic-fadecandy-driver"; version = "0.1.1-r2"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ diagnostic-updater fadecandy-msgs pythonPackages.pyusb rospy ]; + propagatedBuildInputs = [ diagnostic-updater fadecandy-msgs python3Packages.pyusb rospy ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/gencpp/default.nix b/distros/noetic/gencpp/default.nix index 35431ccce5..37b91ea7f3 100644 --- a/distros/noetic/gencpp/default.nix +++ b/distros/noetic/gencpp/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, genmsg, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, genmsg, python3Packages }: buildRosPackage { pname = "ros-noetic-gencpp"; version = "0.6.5-r1"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "catkin"; propagatedBuildInputs = [ genmsg ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''C++ ROS message and service generators.''; diff --git a/distros/noetic/generated.nix b/distros/noetic/generated.nix index 2e207ff445..4dd8277614 100644 --- a/distros/noetic/generated.nix +++ b/distros/noetic/generated.nix @@ -56,16 +56,12 @@ self: super: { canopen-motor-node = self.callPackage ./canopen-motor-node {}; - capabilities = self.callPackage ./capabilities {}; - carrot-planner = self.callPackage ./carrot-planner {}; cartesian-msgs = self.callPackage ./cartesian-msgs {}; catch-ros = self.callPackage ./catch-ros {}; - catkin = self.callPackage ./catkin {}; - class-loader = self.callPackage ./class-loader {}; clear-costmap-recovery = self.callPackage ./clear-costmap-recovery {}; @@ -74,8 +70,6 @@ self: super: { cob-extern = self.callPackage ./cob-extern {}; - code-coverage = self.callPackage ./code-coverage {}; - combined-robot-hw = self.callPackage ./combined-robot-hw {}; combined-robot-hw-tests = self.callPackage ./combined-robot-hw-tests {}; @@ -264,8 +258,6 @@ self: super: { geometry-tutorials = self.callPackage ./geometry-tutorials {}; - gl-dependency = self.callPackage ./gl-dependency {}; - global-planner = self.callPackage ./global-planner {}; global-planner-tests = self.callPackage ./global-planner-tests {}; @@ -454,8 +446,6 @@ self: super: { mk = self.callPackage ./mk {}; - mouse-teleop = self.callPackage ./mouse-teleop {}; - move-base = self.callPackage ./move-base {}; move-base-flex = self.callPackage ./move-base-flex {}; @@ -538,8 +528,6 @@ self: super: { openni2-camera = self.callPackage ./openni2-camera {}; - openni2-launch = self.callPackage ./openni2-launch {}; - openslam-gmapping = self.callPackage ./openslam-gmapping {}; pcl-conversions = self.callPackage ./pcl-conversions {}; @@ -642,8 +630,6 @@ self: super: { robot = self.callPackage ./robot {}; - robot-localization = self.callPackage ./robot-localization {}; - robot-navigation = self.callPackage ./robot-navigation {}; ros = self.callPackage ./ros {}; @@ -670,8 +656,6 @@ self: super: { rosauth = self.callPackage ./rosauth {}; - rosbag = self.callPackage ./rosbag {}; - rosbag-migration-rule = self.callPackage ./rosbag-migration-rule {}; rosbag-storage = self.callPackage ./rosbag-storage {}; @@ -710,6 +694,8 @@ self: super: { rosdiagnostic = self.callPackage ./rosdiagnostic {}; + rosdoc-lite = self.callPackage ./rosdoc-lite {}; + rosemacs = self.callPackage ./rosemacs {}; rosfmt = self.callPackage ./rosfmt {}; @@ -720,8 +706,6 @@ self: super: { roslang = self.callPackage ./roslang {}; - roslaunch = self.callPackage ./roslaunch {}; - roslib = self.callPackage ./roslib {}; roslint = self.callPackage ./roslint {}; @@ -734,8 +718,6 @@ self: super: { rosmake = self.callPackage ./rosmake {}; - rosmaster = self.callPackage ./rosmaster {}; - rosmon = self.callPackage ./rosmon {}; rosmon-core = self.callPackage ./rosmon-core {}; @@ -748,8 +730,6 @@ self: super: { rosout = self.callPackage ./rosout {}; - rospack = self.callPackage ./rospack {}; - rosparam = self.callPackage ./rosparam {}; rosparam-shortcuts = self.callPackage ./rosparam-shortcuts {}; @@ -770,8 +750,6 @@ self: super: { rosunit = self.callPackage ./rosunit {}; - roswtf = self.callPackage ./roswtf {}; - rotate-recovery = self.callPackage ./rotate-recovery {}; rqt = self.callPackage ./rqt {}; @@ -814,8 +792,6 @@ self: super: { rqt-plot = self.callPackage ./rqt-plot {}; - rqt-pose-view = self.callPackage ./rqt-pose-view {}; - rqt-publisher = self.callPackage ./rqt-publisher {}; rqt-py-common = self.callPackage ./rqt-py-common {}; @@ -826,6 +802,8 @@ self: super: { rqt-robot-dashboard = self.callPackage ./rqt-robot-dashboard {}; + rqt-robot-monitor = self.callPackage ./rqt-robot-monitor {}; + rqt-robot-plugins = self.callPackage ./rqt-robot-plugins {}; rqt-robot-steering = self.callPackage ./rqt-robot-steering {}; @@ -1022,8 +1000,6 @@ self: super: { warehouse-ros = self.callPackage ./warehouse-ros {}; - webkit-dependency = self.callPackage ./webkit-dependency {}; - xacro = self.callPackage ./xacro {}; xmlrpcpp = self.callPackage ./xmlrpcpp {}; diff --git a/distros/noetic/geneus/default.nix b/distros/noetic/geneus/default.nix index c679393d19..f23c0e611b 100644 --- a/distros/noetic/geneus/default.nix +++ b/distros/noetic/geneus/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, genmsg, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, genmsg, python3Packages }: buildRosPackage { pname = "ros-noetic-geneus"; version = "3.0.0-r1"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "catkin"; propagatedBuildInputs = [ genmsg ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''EusLisp ROS message and service generators.''; diff --git a/distros/noetic/genlisp/default.nix b/distros/noetic/genlisp/default.nix index 2cb79b7ea3..8b3240026a 100644 --- a/distros/noetic/genlisp/default.nix +++ b/distros/noetic/genlisp/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, genmsg, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, genmsg, python3Packages }: buildRosPackage { pname = "ros-noetic-genlisp"; version = "0.4.18-r1"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "catkin"; propagatedBuildInputs = [ genmsg ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Common-Lisp ROS message and service generators.''; diff --git a/distros/noetic/genmsg/default.nix b/distros/noetic/genmsg/default.nix index 1ede63e5f7..05742586eb 100644 --- a/distros/noetic/genmsg/default.nix +++ b/distros/noetic/genmsg/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages }: buildRosPackage { pname = "ros-noetic-genmsg"; version = "0.5.16-r1"; @@ -14,8 +14,8 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ catkin pythonPackages.empy ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + propagatedBuildInputs = [ catkin python3Packages.empy ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Standalone Python library for generating ROS message and service data structures for various languages.''; diff --git a/distros/noetic/gennodejs/default.nix b/distros/noetic/gennodejs/default.nix index d74a3ceb9c..281f3aaa31 100644 --- a/distros/noetic/gennodejs/default.nix +++ b/distros/noetic/gennodejs/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, genmsg, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, genmsg, python3Packages }: buildRosPackage { pname = "ros-noetic-gennodejs"; version = "2.0.2-r1"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "catkin"; propagatedBuildInputs = [ genmsg ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Javascript ROS message and service generators.''; diff --git a/distros/noetic/genpy/default.nix b/distros/noetic/genpy/default.nix index 0ca4c1d816..003f108bea 100644 --- a/distros/noetic/genpy/default.nix +++ b/distros/noetic/genpy/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, genmsg, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, genmsg, python3Packages }: buildRosPackage { pname = "ros-noetic-genpy"; version = "0.6.12-r1"; @@ -14,8 +14,8 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ genmsg pythonPackages.pyyaml ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + propagatedBuildInputs = [ genmsg python3Packages.pyyaml ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Python ROS message and service generators.''; diff --git a/distros/noetic/geodesy/default.nix b/distros/noetic/geodesy/default.nix index 6e277a0d38..16e69e08dd 100644 --- a/distros/noetic/geodesy/default.nix +++ b/distros/noetic/geodesy/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, angles, catkin, geographic-msgs, geometry-msgs, pythonPackages, rosunit, sensor-msgs, tf, unique-id, uuid-msgs }: +{ lib, buildRosPackage, fetchurl, angles, catkin, geographic-msgs, geometry-msgs, python3Packages, rosunit, sensor-msgs, tf, unique-id, uuid-msgs }: buildRosPackage { pname = "ros-noetic-geodesy"; version = "0.5.5-r1"; @@ -14,10 +14,10 @@ buildRosPackage { }; buildType = "catkin"; - buildInputs = [ angles pythonPackages.catkin-pkg ]; + buildInputs = [ angles python3Packages.catkin-pkg ]; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ geographic-msgs geometry-msgs pythonPackages.pyproj sensor-msgs tf unique-id uuid-msgs ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + propagatedBuildInputs = [ geographic-msgs geometry-msgs python3Packages.pyproj sensor-msgs tf unique-id uuid-msgs ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Python and C++ interfaces for manipulating geodetic coordinates.''; diff --git a/distros/noetic/jderobot-assets/default.nix b/distros/noetic/jderobot-assets/default.nix index 6827487a80..ad36533be8 100644 --- a/distros/noetic/jderobot-assets/default.nix +++ b/distros/noetic/jderobot-assets/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages }: buildRosPackage { pname = "ros-noetic-jderobot-assets"; version = "1.1.0-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''The jderobot_assets package''; diff --git a/distros/noetic/laser-geometry/default.nix b/distros/noetic/laser-geometry/default.nix index fccb10c866..ec03419243 100644 --- a/distros/noetic/laser-geometry/default.nix +++ b/distros/noetic/laser-geometry/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, angles, boost, catkin, eigen, pythonPackages, roscpp, rosunit, sensor-msgs, tf, tf2 }: +{ lib, buildRosPackage, fetchurl, angles, boost, catkin, eigen, python3Packages, roscpp, rosunit, sensor-msgs, tf, tf2 }: buildRosPackage { pname = "ros-noetic-laser-geometry"; version = "1.6.5-r1"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "catkin"; checkInputs = [ rosunit ]; - propagatedBuildInputs = [ angles boost eigen pythonPackages.numpy roscpp sensor-msgs tf tf2 ]; + propagatedBuildInputs = [ angles boost eigen python3Packages.numpy roscpp sensor-msgs tf tf2 ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/mavlink/default.nix b/distros/noetic/mavlink/default.nix index 3595614d01..6371d3aed2 100644 --- a/distros/noetic/mavlink/default.nix +++ b/distros/noetic/mavlink/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, cmake, python, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, cmake, python3, python3Packages }: buildRosPackage { pname = "ros-noetic-mavlink"; version = "2020.6.6-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "cmake"; - buildInputs = [ python pythonPackages.future pythonPackages.lxml ]; + buildInputs = [ python3 python3Packages.future python3Packages.lxml ]; propagatedBuildInputs = [ catkin ]; nativeBuildInputs = [ cmake ]; diff --git a/distros/noetic/mrt-cmake-modules/default.nix b/distros/noetic/mrt-cmake-modules/default.nix index 54bfe1c26b..3a61497403 100644 --- a/distros/noetic/mrt-cmake-modules/default.nix +++ b/distros/noetic/mrt-cmake-modules/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, lcov, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, lcov, python3Packages }: buildRosPackage { pname = "ros-noetic-mrt-cmake-modules"; version = "1.0.3-r1"; @@ -14,8 +14,8 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ lcov pythonPackages.pyyaml pythonPackages.rospkg pythonPackages.setuptools ]; - nativeBuildInputs = [ catkin pythonPackages.pyyaml pythonPackages.rospkg pythonPackages.setuptools ]; + propagatedBuildInputs = [ lcov python3Packages.pyyaml python3Packages.rospkg python3Packages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.pyyaml python3Packages.rospkg python3Packages.setuptools ]; meta = { description = ''CMake Functions and Modules for automating CMake''; diff --git a/distros/noetic/pinocchio/default.nix b/distros/noetic/pinocchio/default.nix index 049c8fc091..aed6837e6c 100644 --- a/distros/noetic/pinocchio/default.nix +++ b/distros/noetic/pinocchio/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, boost, cmake, doxygen, eigen, eigenpy, git, python, pythonPackages, urdfdom }: +{ lib, buildRosPackage, fetchurl, boost, cmake, doxygen, eigen, eigenpy, git, python3, python3Packages, urdfdom }: buildRosPackage { pname = "ros-noetic-pinocchio"; version = "2.4.5-r5"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "cmake"; buildInputs = [ doxygen git ]; - propagatedBuildInputs = [ boost eigen eigenpy python pythonPackages.numpy urdfdom ]; + propagatedBuildInputs = [ boost eigen eigenpy python3 python3Packages.numpy urdfdom ]; nativeBuildInputs = [ cmake ]; meta = { diff --git a/distros/noetic/pybind11-catkin/default.nix b/distros/noetic/pybind11-catkin/default.nix index 81ff51ad98..97766dcec0 100644 --- a/distros/noetic/pybind11-catkin/default.nix +++ b/distros/noetic/pybind11-catkin/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, eigen, python, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, eigen, python3, python3Packages }: buildRosPackage { pname = "ros-noetic-pybind11-catkin"; version = "2.5.0-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ eigen python pythonPackages.numpy ]; + propagatedBuildInputs = [ eigen python3 python3Packages.numpy ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/python-qt-binding/default.nix b/distros/noetic/python-qt-binding/default.nix index e2d317c674..a91aef8984 100644 --- a/distros/noetic/python-qt-binding/default.nix +++ b/distros/noetic/python-qt-binding/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages, qt5, rosbuild }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages, qt5, rosbuild }: buildRosPackage { pname = "ros-noetic-python-qt-binding"; version = "0.4.3-r1"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "catkin"; buildInputs = [ qt5.qtbase rosbuild ]; - propagatedBuildInputs = [ catkin pythonPackages.pyqt5 ]; + propagatedBuildInputs = [ catkin python3Packages.pyqt5 ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/qt-dotgraph/default.nix b/distros/noetic/qt-dotgraph/default.nix index cf5bbf74a5..915b2f00b7 100644 --- a/distros/noetic/qt-dotgraph/default.nix +++ b/distros/noetic/qt-dotgraph/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages }: buildRosPackage { pname = "ros-noetic-qt-dotgraph"; version = "0.4.1-r1"; @@ -14,9 +14,9 @@ buildRosPackage { }; buildType = "catkin"; - checkInputs = [ pythonPackages.pygraphviz ]; - propagatedBuildInputs = [ python-qt-binding pythonPackages.pydot ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + checkInputs = [ python3Packages.pygraphviz ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.pydot ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''qt_dotgraph provides helpers to work with dot graphs.''; diff --git a/distros/noetic/qt-gui-app/default.nix b/distros/noetic/qt-gui-app/default.nix index 9a7bbef2f5..adb44305ad 100644 --- a/distros/noetic/qt-gui-app/default.nix +++ b/distros/noetic/qt-gui-app/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages, qt-gui }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages, qt-gui }: buildRosPackage { pname = "ros-noetic-qt-gui-app"; version = "0.4.1-r1"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "catkin"; propagatedBuildInputs = [ qt-gui ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''qt_gui_app provides the main to start an instance of the integrated graphical user interface provided by qt_gui.''; diff --git a/distros/noetic/qt-gui-cpp/default.nix b/distros/noetic/qt-gui-cpp/default.nix index dce2ea7766..6118366bf2 100644 --- a/distros/noetic/qt-gui-cpp/default.nix +++ b/distros/noetic/qt-gui-cpp/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, cmake-modules, pkg-config, pluginlib, python-qt-binding, pythonPackages, qt-gui, qt5, tinyxml }: +{ lib, buildRosPackage, fetchurl, catkin, cmake-modules, pkg-config, pluginlib, python-qt-binding, python3Packages, qt-gui, qt5, tinyxml }: buildRosPackage { pname = "ros-noetic-qt-gui-cpp"; version = "0.4.1-r1"; @@ -16,7 +16,7 @@ buildRosPackage { buildType = "catkin"; buildInputs = [ cmake-modules pkg-config python-qt-binding qt5.qtbase ]; propagatedBuildInputs = [ pluginlib qt-gui tinyxml ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''qt_gui_cpp provides the foundation for C++-bindings for qt_gui and creates bindings for every generator available. diff --git a/distros/noetic/qt-gui-py-common/default.nix b/distros/noetic/qt-gui-py-common/default.nix index c0a48143f8..2426b18264 100644 --- a/distros/noetic/qt-gui-py-common/default.nix +++ b/distros/noetic/qt-gui-py-common/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages }: buildRosPackage { pname = "ros-noetic-qt-gui-py-common"; version = "0.4.1-r1"; @@ -14,8 +14,8 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''qt_gui_py_common provides common functionality for GUI plugins written in Python.''; diff --git a/distros/noetic/qt-gui/default.nix b/distros/noetic/qt-gui/default.nix index 5459dec967..7bbf840e1f 100644 --- a/distros/noetic/qt-gui/default.nix +++ b/distros/noetic/qt-gui/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, qt5, tango-icon-theme }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, qt5, tango-icon-theme }: buildRosPackage { pname = "ros-noetic-qt-gui"; version = "0.4.1-r1"; @@ -14,9 +14,9 @@ buildRosPackage { }; buildType = "catkin"; - buildInputs = [ pythonPackages.pyqt5 qt5.qtbase ]; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg tango-icon-theme ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + buildInputs = [ python3Packages.pyqt5 qt5.qtbase ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg tango-icon-theme ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''qt_gui provides the infrastructure for an integrated graphical user interface based on Qt. diff --git a/distros/noetic/resource-retriever/default.nix b/distros/noetic/resource-retriever/default.nix index e9c18293b8..dbcce08374 100644 --- a/distros/noetic/resource-retriever/default.nix +++ b/distros/noetic/resource-retriever/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, boost, catkin, curl, pythonPackages, rosconsole, roslib }: +{ lib, buildRosPackage, fetchurl, boost, catkin, curl, python3Packages, rosconsole, roslib }: buildRosPackage { pname = "ros-noetic-resource-retriever"; version = "1.12.6-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ boost curl pythonPackages.rospkg rosconsole roslib ]; + propagatedBuildInputs = [ boost curl python3Packages.rospkg rosconsole roslib ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rosboost-cfg/default.nix b/distros/noetic/rosboost-cfg/default.nix index efd2bf06d2..3b4fa155df 100644 --- a/distros/noetic/rosboost-cfg/default.nix +++ b/distros/noetic/rosboost-cfg/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages }: buildRosPackage { pname = "ros-noetic-rosboost-cfg"; version = "1.15.4-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Contains scripts used by the rosboost-cfg tool for determining cflags/lflags/etc. of boost on your system''; diff --git a/distros/noetic/rosbridge-library/default.nix b/distros/noetic/rosbridge-library/default.nix index 45a4a5ab75..9eae426b02 100644 --- a/distros/noetic/rosbridge-library/default.nix +++ b/distros/noetic/rosbridge-library/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, actionlib-msgs, catkin, diagnostic-msgs, geometry-msgs, message-generation, message-runtime, nav-msgs, pythonPackages, roscpp, rosgraph, rospy, rospy-tutorials, rosservice, rostest, rostopic, sensor-msgs, std-msgs, std-srvs, stereo-msgs, tf2-msgs, trajectory-msgs, visualization-msgs }: +{ lib, buildRosPackage, fetchurl, actionlib-msgs, catkin, diagnostic-msgs, geometry-msgs, message-generation, message-runtime, nav-msgs, python3Packages, roscpp, rosgraph, rospy, rospy-tutorials, rosservice, rostest, rostopic, sensor-msgs, std-msgs, std-srvs, stereo-msgs, tf2-msgs, trajectory-msgs, visualization-msgs }: buildRosPackage { pname = "ros-noetic-rosbridge-library"; version = "0.11.9-r1"; @@ -16,7 +16,7 @@ buildRosPackage { buildType = "catkin"; buildInputs = [ message-generation ]; checkInputs = [ actionlib-msgs diagnostic-msgs nav-msgs rospy-tutorials rostest sensor-msgs std-srvs stereo-msgs tf2-msgs trajectory-msgs visualization-msgs ]; - propagatedBuildInputs = [ geometry-msgs message-runtime pythonPackages.bson pythonPackages.pillow roscpp rosgraph rospy rosservice rostopic std-msgs ]; + propagatedBuildInputs = [ geometry-msgs message-runtime python3Packages.bson python3Packages.pillow roscpp rosgraph rospy rosservice rostopic std-msgs ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rosbridge-server/default.nix b/distros/noetic/rosbridge-server/default.nix index 878c30ab91..73c5181bfc 100644 --- a/distros/noetic/rosbridge-server/default.nix +++ b/distros/noetic/rosbridge-server/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages, rosapi, rosauth, rosbridge-library, rosbridge-msgs, rospy, rostest }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages, rosapi, rosauth, rosbridge-library, rosbridge-msgs, rospy, rostest }: buildRosPackage { pname = "ros-noetic-rosbridge-server"; version = "0.11.9-r1"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "catkin"; checkInputs = [ rostest ]; - propagatedBuildInputs = [ pythonPackages.autobahn pythonPackages.backports_ssl_match_hostname pythonPackages.tornado pythonPackages.twisted rosapi rosauth rosbridge-library rosbridge-msgs rospy ]; + propagatedBuildInputs = [ python3Packages.autobahn python3Packages.tornado python3Packages.twisted rosapi rosauth rosbridge-library rosbridge-msgs rospy ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rosclean/default.nix b/distros/noetic/rosclean/default.nix index e2bb4651df..74a19e80b2 100644 --- a/distros/noetic/rosclean/default.nix +++ b/distros/noetic/rosclean/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages }: buildRosPackage { pname = "ros-noetic-rosclean"; version = "1.15.4-r1"; @@ -14,8 +14,8 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ pythonPackages.rospkg ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + propagatedBuildInputs = [ python3Packages.rospkg ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''rosclean: cleanup filesystem resources (e.g. log files).''; diff --git a/distros/noetic/roscreate/default.nix b/distros/noetic/roscreate/default.nix index ada19068ba..15c49926a4 100644 --- a/distros/noetic/roscreate/default.nix +++ b/distros/noetic/roscreate/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages, roslib }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages, roslib }: buildRosPackage { pname = "ros-noetic-roscreate"; version = "1.15.4-r1"; @@ -14,8 +14,8 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ pythonPackages.rospkg roslib ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + propagatedBuildInputs = [ python3Packages.rospkg roslib ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''roscreate contains a tool that assists in the creation of ROS filesystem resources. diff --git a/distros/noetic/rosdoc-lite/default.nix b/distros/noetic/rosdoc-lite/default.nix new file mode 100644 index 0000000000..0627863bab --- /dev/null +++ b/distros/noetic/rosdoc-lite/default.nix @@ -0,0 +1,28 @@ + +# Copyright 2020 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ lib, buildRosPackage, fetchurl, catkin, doxygen, genmsg, python3Packages }: +buildRosPackage { + pname = "ros-noetic-rosdoc-lite"; + version = "0.2.10-r1"; + + src = fetchurl { + url = "https://github.com/ros-gbp/rosdoc_lite-release/archive/release/noetic/rosdoc_lite/0.2.10-1.tar.gz"; + name = "0.2.10-1.tar.gz"; + sha256 = "f6c654ab10e56b36bc7ff84ae7de6126011c44ebec7c3b9e14c4018643bd15c9"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ doxygen genmsg python3Packages.catkin-pkg python3Packages.kitchen python3Packages.pyyaml python3Packages.rospkg python3Packages.sphinx ]; + nativeBuildInputs = [ catkin ]; + + meta = { + description = ''This ROS package wraps documentation tools like doxygen, sphinx, + and epydoc, making it convenient to generate ROS package + documentation. + + It also generates online documentation for the ROS wiki.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/noetic/rosgraph/default.nix b/distros/noetic/rosgraph/default.nix index 61e9b2d322..f6932a990c 100644 --- a/distros/noetic/rosgraph/default.nix +++ b/distros/noetic/rosgraph/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages }: buildRosPackage { pname = "ros-noetic-rosgraph"; version = "1.15.7-r1"; @@ -14,8 +14,8 @@ buildRosPackage { }; buildType = "catkin"; - checkInputs = [ pythonPackages.mock ]; - propagatedBuildInputs = [ pythonPackages.netifaces pythonPackages.pyyaml pythonPackages.rospkg ]; + checkInputs = [ python3Packages.mock ]; + propagatedBuildInputs = [ python3Packages.netifaces python3Packages.pyyaml python3Packages.rospkg ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/roslib/default.nix b/distros/noetic/roslib/default.nix index ca2e42a4e6..7a6c244737 100644 --- a/distros/noetic/roslib/default.nix +++ b/distros/noetic/roslib/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, boost, catkin, pythonPackages, ros-environment, rosmake, rospack }: +{ lib, buildRosPackage, fetchurl, boost, catkin, python3Packages, ros-environment, rosmake, rospack }: buildRosPackage { pname = "ros-noetic-roslib"; version = "1.15.4-r1"; @@ -16,8 +16,8 @@ buildRosPackage { buildType = "catkin"; buildInputs = [ boost ]; checkInputs = [ rosmake ]; - propagatedBuildInputs = [ catkin pythonPackages.rospkg ros-environment rospack ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + propagatedBuildInputs = [ catkin python3Packages.rospkg ros-environment rospack ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Base dependencies and support libraries for ROS. diff --git a/distros/noetic/rosmake/default.nix b/distros/noetic/rosmake/default.nix index 9b763ec1ec..bfb833b151 100644 --- a/distros/noetic/rosmake/default.nix +++ b/distros/noetic/rosmake/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages }: buildRosPackage { pname = "ros-noetic-rosmake"; version = "1.15.4-r1"; @@ -14,8 +14,8 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ catkin pythonPackages.rospkg ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + propagatedBuildInputs = [ catkin python3Packages.rospkg ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''rosmake is a ros dependency aware build tool which can be used to diff --git a/distros/noetic/rosmon-core/default.nix b/distros/noetic/rosmon-core/default.nix index 482dbdc6bc..e36cd1063a 100644 --- a/distros/noetic/rosmon-core/default.nix +++ b/distros/noetic/rosmon-core/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, boost, catch-ros, catkin, cmake-modules, diagnostic-msgs, libyamlcpp, ncurses, python, pythonPackages, rosbash, roscpp, rosfmt, roslib, rosmon-msgs, rospack, rostest, std-msgs, tinyxml }: +{ lib, buildRosPackage, fetchurl, boost, catch-ros, catkin, cmake-modules, diagnostic-msgs, libyamlcpp, ncurses, python3, python3Packages, rosbash, roscpp, rosfmt, roslib, rosmon-msgs, rospack, rostest, std-msgs, tinyxml }: buildRosPackage { pname = "ros-noetic-rosmon-core"; version = "2.3.2-r1"; @@ -14,8 +14,8 @@ buildRosPackage { }; buildType = "catkin"; - buildInputs = [ python ]; - checkInputs = [ catch-ros pythonPackages.rospkg rostest ]; + buildInputs = [ python3 ]; + checkInputs = [ catch-ros python3Packages.rospkg rostest ]; propagatedBuildInputs = [ boost cmake-modules diagnostic-msgs libyamlcpp ncurses rosbash roscpp rosfmt roslib rosmon-msgs rospack std-msgs tinyxml ]; nativeBuildInputs = [ catkin ]; diff --git a/distros/noetic/rosmsg/default.nix b/distros/noetic/rosmsg/default.nix index aef8e762fa..ffa9f56f8a 100644 --- a/distros/noetic/rosmsg/default.nix +++ b/distros/noetic/rosmsg/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, genmsg, genpy, pythonPackages, rosbag, roslib, std-msgs }: +{ lib, buildRosPackage, fetchurl, catkin, genmsg, genpy, python3Packages, rosbag, roslib, std-msgs }: buildRosPackage { pname = "ros-noetic-rosmsg"; version = "1.15.7-r1"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "catkin"; checkInputs = [ std-msgs ]; - propagatedBuildInputs = [ catkin genmsg genpy pythonPackages.rospkg rosbag roslib ]; + propagatedBuildInputs = [ catkin genmsg genpy python3Packages.rospkg rosbag roslib ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rosparam/default.nix b/distros/noetic/rosparam/default.nix index dd4b36c8b2..dc70a9694c 100644 --- a/distros/noetic/rosparam/default.nix +++ b/distros/noetic/rosparam/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages, rosgraph }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages, rosgraph }: buildRosPackage { pname = "ros-noetic-rosparam"; version = "1.15.7-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ pythonPackages.pyyaml rosgraph ]; + propagatedBuildInputs = [ python3Packages.pyyaml rosgraph ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rospy/default.nix b/distros/noetic/rospy/default.nix index 42f06f189c..a06b3c0a68 100644 --- a/distros/noetic/rospy/default.nix +++ b/distros/noetic/rospy/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, genpy, pythonPackages, roscpp, rosgraph, rosgraph-msgs, roslib, std-msgs }: +{ lib, buildRosPackage, fetchurl, catkin, genpy, python3Packages, roscpp, rosgraph, rosgraph-msgs, roslib, std-msgs }: buildRosPackage { pname = "ros-noetic-rospy"; version = "1.15.7-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ genpy pythonPackages.numpy pythonPackages.pyyaml pythonPackages.rospkg roscpp rosgraph rosgraph-msgs roslib std-msgs ]; + propagatedBuildInputs = [ genpy python3Packages.numpy python3Packages.pyyaml python3Packages.rospkg roscpp rosgraph rosgraph-msgs roslib std-msgs ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rosunit/default.nix b/distros/noetic/rosunit/default.nix index bf326d815e..75b7fdaa92 100644 --- a/distros/noetic/rosunit/default.nix +++ b/distros/noetic/rosunit/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages, roslib }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages, roslib }: buildRosPackage { pname = "ros-noetic-rosunit"; version = "1.15.4-r1"; @@ -14,8 +14,8 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ pythonPackages.rospkg roslib ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + propagatedBuildInputs = [ python3Packages.rospkg roslib ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Unit-testing package for ROS. This is a lower-level library for rostest and handles unit tests, whereas rostest handles integration tests.''; diff --git a/distros/noetic/rqt-bag-plugins/default.nix b/distros/noetic/rqt-bag-plugins/default.nix index 7b6c3dadd7..eb9bcac5d6 100644 --- a/distros/noetic/rqt-bag-plugins/default.nix +++ b/distros/noetic/rqt-bag-plugins/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, geometry-msgs, pythonPackages, rosbag, roslib, rospy, rqt-bag, rqt-gui, rqt-gui-py, rqt-plot, sensor-msgs, std-msgs }: +{ lib, buildRosPackage, fetchurl, catkin, geometry-msgs, python3Packages, rosbag, roslib, rospy, rqt-bag, rqt-gui, rqt-gui-py, rqt-plot, sensor-msgs, std-msgs }: buildRosPackage { pname = "ros-noetic-rqt-bag-plugins"; version = "0.4.13-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ geometry-msgs pythonPackages.pillow pythonPackages.pycairo rosbag roslib rospy rqt-bag rqt-gui rqt-gui-py rqt-plot sensor-msgs std-msgs ]; + propagatedBuildInputs = [ geometry-msgs python3Packages.pillow python3Packages.pycairo rosbag roslib rospy rqt-bag rqt-gui rqt-gui-py rqt-plot sensor-msgs std-msgs ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-bag/default.nix b/distros/noetic/rqt-bag/default.nix index 3e420836af..fb33d24fc2 100644 --- a/distros/noetic/rqt-bag/default.nix +++ b/distros/noetic/rqt-bag/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, rosbag, rosgraph-msgs, roslib, rosnode, rospy, rqt-gui, rqt-gui-py }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, rosbag, rosgraph-msgs, roslib, rosnode, rospy, rqt-gui, rqt-gui-py }: buildRosPackage { pname = "ros-noetic-rqt-bag"; version = "0.4.13-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg rosbag rosgraph-msgs roslib rosnode rospy rqt-gui rqt-gui-py ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg rosbag rosgraph-msgs roslib rosnode rospy rqt-gui rqt-gui-py ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-console/default.nix b/distros/noetic/rqt-console/default.nix index 854e4f3574..a9fd567c90 100644 --- a/distros/noetic/rqt-console/default.nix +++ b/distros/noetic/rqt-console/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, roslib, rospy, rqt-gui, rqt-gui-py, rqt-logger-level, rqt-py-common }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, roslib, rospy, rqt-gui, rqt-gui-py, rqt-logger-level, rqt-py-common }: buildRosPackage { pname = "ros-noetic-rqt-console"; version = "0.4.11-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg roslib rospy rqt-gui rqt-gui-py rqt-logger-level rqt-py-common ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg roslib rospy rqt-gui rqt-gui-py rqt-logger-level rqt-py-common ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-controller-manager/default.nix b/distros/noetic/rqt-controller-manager/default.nix index d931cb96f8..e9cd1306d2 100644 --- a/distros/noetic/rqt-controller-manager/default.nix +++ b/distros/noetic/rqt-controller-manager/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, controller-manager-msgs, pythonPackages, rospy, rqt-gui, rqt-gui-py }: +{ lib, buildRosPackage, fetchurl, catkin, controller-manager-msgs, python3Packages, rospy, rqt-gui, rqt-gui-py }: buildRosPackage { pname = "ros-noetic-rqt-controller-manager"; version = "0.19.1-r1"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "catkin"; propagatedBuildInputs = [ controller-manager-msgs rospy rqt-gui rqt-gui-py ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Graphical frontend for interacting with the controller manager.''; diff --git a/distros/noetic/rqt-dep/default.nix b/distros/noetic/rqt-dep/default.nix index 29cb04ed94..b5da15e8e2 100644 --- a/distros/noetic/rqt-dep/default.nix +++ b/distros/noetic/rqt-dep/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, qt-dotgraph, qt-gui, qt-gui-py-common, rqt-graph, rqt-gui-py }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, qt-dotgraph, qt-gui, qt-gui-py-common, rqt-graph, rqt-gui-py }: buildRosPackage { pname = "ros-noetic-rqt-dep"; version = "0.4.10-r1"; @@ -14,8 +14,8 @@ buildRosPackage { }; buildType = "catkin"; - checkInputs = [ pythonPackages.mock ]; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg qt-dotgraph qt-gui qt-gui-py-common rqt-graph rqt-gui-py ]; + checkInputs = [ python3Packages.mock ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg qt-dotgraph qt-gui qt-gui-py-common rqt-graph rqt-gui-py ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-graph/default.nix b/distros/noetic/rqt-graph/default.nix index 409be84ec7..d35de5391c 100644 --- a/distros/noetic/rqt-graph/default.nix +++ b/distros/noetic/rqt-graph/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, qt-dotgraph, rosgraph, rosgraph-msgs, roslib, rosnode, rospy, rosservice, rostopic, rqt-gui, rqt-gui-py }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, qt-dotgraph, rosgraph, rosgraph-msgs, roslib, rosnode, rospy, rosservice, rostopic, rqt-gui, rqt-gui-py }: buildRosPackage { pname = "ros-noetic-rqt-graph"; version = "0.4.14-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg qt-dotgraph rosgraph rosgraph-msgs roslib rosnode rospy rosservice rostopic rqt-gui rqt-gui-py ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg qt-dotgraph rosgraph rosgraph-msgs roslib rosnode rospy rosservice rostopic rqt-gui rqt-gui-py ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-logger-level/default.nix b/distros/noetic/rqt-logger-level/default.nix index 9f14fe1100..6f4a31c04d 100644 --- a/distros/noetic/rqt-logger-level/default.nix +++ b/distros/noetic/rqt-logger-level/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, rosnode, rospy, rosservice, rqt-gui, rqt-gui-py }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, rosnode, rospy, rosservice, rqt-gui, rqt-gui-py }: buildRosPackage { pname = "ros-noetic-rqt-logger-level"; version = "0.4.11-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg rosnode rospy rosservice rqt-gui rqt-gui-py ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg rosnode rospy rosservice rqt-gui rqt-gui-py ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-moveit/default.nix b/distros/noetic/rqt-moveit/default.nix index 95da2e938c..aa83da9cc0 100644 --- a/distros/noetic/rqt-moveit/default.nix +++ b/distros/noetic/rqt-moveit/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, rosnode, rospy, rostopic, rqt-gui, rqt-gui-py, rqt-py-common, rqt-topic, sensor-msgs }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, rosnode, rospy, rostopic, rqt-gui, rqt-gui-py, rqt-py-common, rqt-topic, sensor-msgs }: buildRosPackage { pname = "ros-noetic-rqt-moveit"; version = "0.5.9-r3"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "catkin"; propagatedBuildInputs = [ python-qt-binding rosnode rospy rostopic rqt-gui rqt-gui-py rqt-py-common rqt-topic sensor-msgs ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''An rqt-based tool that assists monitoring tasks diff --git a/distros/noetic/rqt-msg/default.nix b/distros/noetic/rqt-msg/default.nix index b18691fd03..22f7b33ff5 100644 --- a/distros/noetic/rqt-msg/default.nix +++ b/distros/noetic/rqt-msg/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, roslib, rosmsg, rospy, rqt-console, rqt-gui, rqt-gui-py, rqt-py-common }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, roslib, rosmsg, rospy, rqt-console, rqt-gui, rqt-gui-py, rqt-py-common }: buildRosPackage { pname = "ros-noetic-rqt-msg"; version = "0.4.9-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg roslib rosmsg rospy rqt-console rqt-gui rqt-gui-py rqt-py-common ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg roslib rosmsg rospy rqt-console rqt-gui rqt-gui-py rqt-py-common ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-plot/default.nix b/distros/noetic/rqt-plot/default.nix index 31f293c46e..272cba51bc 100644 --- a/distros/noetic/rqt-plot/default.nix +++ b/distros/noetic/rqt-plot/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, qt-gui-py-common, qwt-dependency, rosgraph, rostopic, rqt-gui, rqt-gui-py, rqt-py-common, std-msgs }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, qt-gui-py-common, qwt-dependency, rosgraph, rostopic, rqt-gui, rqt-gui-py, rqt-py-common, std-msgs }: buildRosPackage { pname = "ros-noetic-rqt-plot"; version = "0.4.12-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.matplotlib pythonPackages.numpy pythonPackages.rospkg qt-gui-py-common qwt-dependency rosgraph rostopic rqt-gui rqt-gui-py rqt-py-common std-msgs ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.matplotlib python3Packages.numpy python3Packages.rospkg qt-gui-py-common qwt-dependency rosgraph rostopic rqt-gui rqt-gui-py rqt-py-common std-msgs ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-publisher/default.nix b/distros/noetic/rqt-publisher/default.nix index d7ec392cb7..f84af2fb59 100644 --- a/distros/noetic/rqt-publisher/default.nix +++ b/distros/noetic/rqt-publisher/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, qt-gui-py-common, roslib, rosmsg, rqt-gui, rqt-gui-py, rqt-py-common }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, qt-gui-py-common, roslib, rosmsg, rqt-gui, rqt-gui-py, rqt-py-common }: buildRosPackage { pname = "ros-noetic-rqt-publisher"; version = "0.4.9-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg qt-gui-py-common roslib rosmsg rqt-gui rqt-gui-py rqt-py-common ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg qt-gui-py-common roslib rosmsg rqt-gui rqt-gui-py rqt-py-common ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-py-console/default.nix b/distros/noetic/rqt-py-console/default.nix index c992127132..bd7033c22b 100644 --- a/distros/noetic/rqt-py-console/default.nix +++ b/distros/noetic/rqt-py-console/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, qt-gui, qt-gui-py-common, rospy, rqt-gui, rqt-gui-py }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, qt-gui, qt-gui-py-common, rospy, rqt-gui, rqt-gui-py }: buildRosPackage { pname = "ros-noetic-rqt-py-console"; version = "0.4.9-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg qt-gui qt-gui-py-common rospy rqt-gui rqt-gui-py ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg qt-gui qt-gui-py-common rospy rqt-gui rqt-gui-py ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-reconfigure/default.nix b/distros/noetic/rqt-reconfigure/default.nix index 69844bdd46..13df678fdf 100644 --- a/distros/noetic/rqt-reconfigure/default.nix +++ b/distros/noetic/rqt-reconfigure/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, dynamic-reconfigure, python-qt-binding, pythonPackages, roslint, rospy, rostest, rqt-console, rqt-gui, rqt-gui-py, rqt-py-common }: +{ lib, buildRosPackage, fetchurl, catkin, dynamic-reconfigure, python-qt-binding, python3Packages, roslint, rospy, rostest, rqt-console, rqt-gui, rqt-gui-py, rqt-py-common }: buildRosPackage { pname = "ros-noetic-rqt-reconfigure"; version = "0.5.2-r1"; @@ -16,8 +16,8 @@ buildRosPackage { buildType = "catkin"; buildInputs = [ roslint ]; checkInputs = [ rostest ]; - propagatedBuildInputs = [ dynamic-reconfigure python-qt-binding pythonPackages.pyyaml rospy rqt-console rqt-gui rqt-gui-py rqt-py-common ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + propagatedBuildInputs = [ dynamic-reconfigure python-qt-binding python3Packages.pyyaml rospy rqt-console rqt-gui rqt-gui-py rqt-py-common ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''This rqt plugin succeeds former dynamic_reconfigure's GUI diff --git a/distros/noetic/rqt-robot-dashboard/default.nix b/distros/noetic/rqt-robot-dashboard/default.nix index 4c064759cb..f357f87be5 100644 --- a/distros/noetic/rqt-robot-dashboard/default.nix +++ b/distros/noetic/rqt-robot-dashboard/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, diagnostic-msgs, python-qt-binding, pythonPackages, qt-gui, rospy, rqt-console, rqt-gui, rqt-gui-py, rqt-nav-view, rqt-robot-monitor }: +{ lib, buildRosPackage, fetchurl, catkin, diagnostic-msgs, python-qt-binding, python3Packages, qt-gui, rospy, rqt-console, rqt-gui, rqt-gui-py, rqt-nav-view, rqt-robot-monitor }: buildRosPackage { pname = "ros-noetic-rqt-robot-dashboard"; version = "0.5.8-r1"; @@ -15,7 +15,7 @@ buildRosPackage { buildType = "catkin"; propagatedBuildInputs = [ diagnostic-msgs python-qt-binding qt-gui rospy rqt-console rqt-gui rqt-gui-py rqt-nav-view rqt-robot-monitor ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''rqt_robot_dashboard provides an infrastructure for building robot dashboard plugins in rqt.''; diff --git a/distros/noetic/rqt-robot-monitor/default.nix b/distros/noetic/rqt-robot-monitor/default.nix new file mode 100644 index 0000000000..2488bc8775 --- /dev/null +++ b/distros/noetic/rqt-robot-monitor/default.nix @@ -0,0 +1,37 @@ + +# Copyright 2020 Open Source Robotics Foundation +# Distributed under the terms of the BSD license + +{ 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.12-r2"; + + src = fetchurl { + url = "https://github.com/ros-gbp/rqt_robot_monitor-release/archive/release/noetic/rqt_robot_monitor/0.5.12-2.tar.gz"; + name = "0.5.12-2.tar.gz"; + sha256 = "696d3422af123fc63c9e9f0b85e30d11c9560617cec7c75bcfd3105012c2ed8d"; + }; + + buildType = "catkin"; + propagatedBuildInputs = [ diagnostic-msgs python-qt-binding python3Packages.rospkg qt-gui qt-gui-py-common rospy rqt-bag rqt-gui rqt-gui-py rqt-py-common ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; + + meta = { + description = ''rqt_robot_monitor displays diagnostics_agg topics messages that + are published by diagnostic_aggregator. + rqt_robot_monitor is a direct port to rqt of + robot_monitor. All + diagnostics are fall into one of three tree panes depending on the status of + diagnostics (normal, warning, error/stale). Status are shown in trees to + represent their hierarchy. Worse status dominates the higher level status.
+ + You can look at the detail of each status by double-clicking the tree nodes.
+ + Currently re-usable API to other pkgs are not explicitly provided.''; + license = with lib.licenses; [ bsdOriginal ]; + }; +} diff --git a/distros/noetic/rqt-robot-steering/default.nix b/distros/noetic/rqt-robot-steering/default.nix index e6bf9825de..891c6637e2 100644 --- a/distros/noetic/rqt-robot-steering/default.nix +++ b/distros/noetic/rqt-robot-steering/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, geometry-msgs, python-qt-binding, pythonPackages, rostopic, rqt-gui, rqt-gui-py }: +{ lib, buildRosPackage, fetchurl, catkin, geometry-msgs, python-qt-binding, python3Packages, rostopic, rqt-gui, rqt-gui-py }: buildRosPackage { pname = "ros-noetic-rqt-robot-steering"; version = "0.5.11-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ geometry-msgs python-qt-binding pythonPackages.rospkg rostopic rqt-gui rqt-gui-py ]; + propagatedBuildInputs = [ geometry-msgs python-qt-binding python3Packages.rospkg rostopic rqt-gui rqt-gui-py ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-runtime-monitor/default.nix b/distros/noetic/rqt-runtime-monitor/default.nix index c150a106aa..88197ffabb 100644 --- a/distros/noetic/rqt-runtime-monitor/default.nix +++ b/distros/noetic/rqt-runtime-monitor/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, diagnostic-msgs, python-qt-binding, pythonPackages, qt-gui, rospy, rqt-gui, rqt-gui-py }: +{ lib, buildRosPackage, fetchurl, catkin, diagnostic-msgs, python-qt-binding, python3Packages, qt-gui, rospy, rqt-gui, rqt-gui-py }: buildRosPackage { pname = "ros-noetic-rqt-runtime-monitor"; version = "0.5.8-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ diagnostic-msgs python-qt-binding pythonPackages.rospkg qt-gui rospy rqt-gui rqt-gui-py ]; + propagatedBuildInputs = [ diagnostic-msgs python-qt-binding python3Packages.rospkg qt-gui rospy rqt-gui rqt-gui-py ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-service-caller/default.nix b/distros/noetic/rqt-service-caller/default.nix index b384e2b268..b073be9fcb 100644 --- a/distros/noetic/rqt-service-caller/default.nix +++ b/distros/noetic/rqt-service-caller/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages, rosservice, rqt-gui, rqt-gui-py, rqt-py-common }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages, rosservice, rqt-gui, rqt-gui-py, rqt-py-common }: buildRosPackage { pname = "ros-noetic-rqt-service-caller"; version = "0.4.9-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ pythonPackages.rospkg rosservice rqt-gui rqt-gui-py rqt-py-common ]; + propagatedBuildInputs = [ python3Packages.rospkg rosservice rqt-gui rqt-gui-py rqt-py-common ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-shell/default.nix b/distros/noetic/rqt-shell/default.nix index 12288096e8..65139bd9fa 100644 --- a/distros/noetic/rqt-shell/default.nix +++ b/distros/noetic/rqt-shell/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, qt-gui, qt-gui-py-common, rqt-gui, rqt-gui-py }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, qt-gui, qt-gui-py-common, rqt-gui, rqt-gui-py }: buildRosPackage { pname = "ros-noetic-rqt-shell"; version = "0.4.10-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg qt-gui qt-gui-py-common rqt-gui rqt-gui-py ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg qt-gui qt-gui-py-common rqt-gui rqt-gui-py ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-tf-tree/default.nix b/distros/noetic/rqt-tf-tree/default.nix index 932632bb1b..f3ff709bb3 100644 --- a/distros/noetic/rqt-tf-tree/default.nix +++ b/distros/noetic/rqt-tf-tree/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, qt-dotgraph, rospy, rqt-graph, rqt-gui, rqt-gui-py, tf2-msgs, tf2-ros }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, qt-dotgraph, rospy, rqt-graph, rqt-gui, rqt-gui-py, tf2-msgs, tf2-ros }: buildRosPackage { pname = "ros-noetic-rqt-tf-tree"; version = "0.6.1-r1"; @@ -14,8 +14,8 @@ buildRosPackage { }; buildType = "catkin"; - checkInputs = [ pythonPackages.mock ]; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg qt-dotgraph rospy rqt-graph rqt-gui rqt-gui-py tf2-msgs tf2-ros ]; + checkInputs = [ python3Packages.mock ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg qt-dotgraph rospy rqt-graph rqt-gui rqt-gui-py tf2-msgs tf2-ros ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-top/default.nix b/distros/noetic/rqt-top/default.nix index d80e1c51c3..c3256316e4 100644 --- a/distros/noetic/rqt-top/default.nix +++ b/distros/noetic/rqt-top/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, rospy, rqt-gui, rqt-gui-py }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, rospy, rqt-gui, rqt-gui-py }: buildRosPackage { pname = "ros-noetic-rqt-top"; version = "0.4.9-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.psutil rospy rqt-gui rqt-gui-py ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.psutil rospy rqt-gui rqt-gui-py ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-topic/default.nix b/distros/noetic/rqt-topic/default.nix index ecf41968cf..a7a53db104 100644 --- a/distros/noetic/rqt-topic/default.nix +++ b/distros/noetic/rqt-topic/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, rostopic, rqt-gui, rqt-gui-py, std-msgs }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, rostopic, rqt-gui, rqt-gui-py, std-msgs }: buildRosPackage { pname = "ros-noetic-rqt-topic"; version = "0.4.12-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg rostopic rqt-gui rqt-gui-py std-msgs ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg rostopic rqt-gui rqt-gui-py std-msgs ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/rqt-web/default.nix b/distros/noetic/rqt-web/default.nix index af22997890..4b7d045536 100644 --- a/distros/noetic/rqt-web/default.nix +++ b/distros/noetic/rqt-web/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, pythonPackages, qt-gui, rospy, rqt-gui, rqt-gui-py, webkit-dependency }: +{ lib, buildRosPackage, fetchurl, catkin, python-qt-binding, python3Packages, qt-gui, rospy, rqt-gui, rqt-gui-py, webkit-dependency }: buildRosPackage { pname = "ros-noetic-rqt-web"; version = "0.4.9-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - propagatedBuildInputs = [ python-qt-binding pythonPackages.rospkg qt-gui rospy rqt-gui rqt-gui-py webkit-dependency ]; + propagatedBuildInputs = [ python-qt-binding python3Packages.rospkg qt-gui rospy rqt-gui rqt-gui-py webkit-dependency ]; nativeBuildInputs = [ catkin ]; meta = { diff --git a/distros/noetic/sensor-msgs/default.nix b/distros/noetic/sensor-msgs/default.nix index 8ce3cb75cd..34567da1ae 100644 --- a/distros/noetic/sensor-msgs/default.nix +++ b/distros/noetic/sensor-msgs/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, pythonPackages, rosbag, rosunit, std-msgs }: +{ lib, buildRosPackage, fetchurl, catkin, geometry-msgs, message-generation, message-runtime, python3Packages, rosbag, rosunit, std-msgs }: buildRosPackage { pname = "ros-noetic-sensor-msgs"; version = "1.13.0-r1"; @@ -17,7 +17,7 @@ buildRosPackage { buildInputs = [ message-generation ]; checkInputs = [ rosbag rosunit ]; propagatedBuildInputs = [ geometry-msgs message-runtime std-msgs ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''This package defines messages for commonly used sensors, including diff --git a/distros/noetic/smclib/default.nix b/distros/noetic/smclib/default.nix index 292eca98ed..be8bfd351a 100644 --- a/distros/noetic/smclib/default.nix +++ b/distros/noetic/smclib/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages }: buildRosPackage { pname = "ros-noetic-smclib"; version = "1.8.5-r1"; @@ -14,7 +14,7 @@ buildRosPackage { }; buildType = "catkin"; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''The State Machine Compiler (SMC) from http://smc.sourceforge.net/ diff --git a/distros/noetic/urdfdom-py/default.nix b/distros/noetic/urdfdom-py/default.nix index 1d26f6456b..85f15c8321 100644 --- a/distros/noetic/urdfdom-py/default.nix +++ b/distros/noetic/urdfdom-py/default.nix @@ -2,7 +2,7 @@ # Copyright 2020 Open Source Robotics Foundation # Distributed under the terms of the BSD license -{ lib, buildRosPackage, fetchurl, catkin, pythonPackages, rospy }: +{ lib, buildRosPackage, fetchurl, catkin, python3Packages, rospy }: buildRosPackage { pname = "ros-noetic-urdfdom-py"; version = "0.4.3-r1"; @@ -14,9 +14,9 @@ buildRosPackage { }; buildType = "catkin"; - checkInputs = [ pythonPackages.mock ]; - propagatedBuildInputs = [ pythonPackages.pyyaml rospy ]; - nativeBuildInputs = [ catkin pythonPackages.setuptools ]; + checkInputs = [ python3Packages.mock ]; + propagatedBuildInputs = [ python3Packages.pyyaml rospy ]; + nativeBuildInputs = [ catkin python3Packages.setuptools ]; meta = { description = ''Python implementation of the URDF parser.'';